summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-17 11:01:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 20:50:05 +0200
commit2925efd2fcef1f8b9fd48979144877c1a5ec214b (patch)
tree5e0720412202468499c2bd41d4ec8d5952618f8a /Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
parent4ff1d0e1e73e6467aeed9313afe09ec6ece4884d (diff)
downloadqtwebkit-2925efd2fcef1f8b9fd48979144877c1a5ec214b.tar.gz
Remove C++11 requirement in WebKit2
Removes all use of C++11 specific features in WebKit2. This consists of template<S<T>> syntax, a few uses of auto, and a single use of std::move. Change-Id: I1bbd356c430802caf5f7440cd0d3bb2ba49ed098 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp')
-rw-r--r--Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
index 6af593a54..e89accaf4 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
@@ -71,7 +71,11 @@ uint64_t PluginProcessManager::pluginProcessToken(const PluginModuleInfo& plugin
attributes.processType = pluginProcessType;
attributes.sandboxPolicy = pluginProcessSandboxPolicy;
+#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
m_pluginProcessTokens.append(std::make_pair(std::move(attributes), token));
+#else
+ m_pluginProcessTokens.append(std::make_pair(attributes, token));
+#endif
m_knownTokens.add(token);
return token;
@@ -113,7 +117,7 @@ PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(uint64_t plug
}
for (size_t i = 0; i < m_pluginProcessTokens.size(); ++i) {
- auto& attributesAndToken = m_pluginProcessTokens[i];
+ std::pair<PluginProcessAttributes, uint64_t>& attributesAndToken = m_pluginProcessTokens[i];
if (attributesAndToken.second == pluginProcessToken) {
RefPtr<PluginProcessProxy> pluginProcess = PluginProcessProxy::create(this, attributesAndToken.first, attributesAndToken.second);
PluginProcessProxy* pluginProcessPtr = pluginProcess.get();