diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/plugins/PluginMainThreadScheduler.cpp | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/plugins/PluginMainThreadScheduler.cpp')
-rw-r--r-- | Source/WebCore/plugins/PluginMainThreadScheduler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/plugins/PluginMainThreadScheduler.cpp b/Source/WebCore/plugins/PluginMainThreadScheduler.cpp index 7528676b1..39ae794e2 100644 --- a/Source/WebCore/plugins/PluginMainThreadScheduler.cpp +++ b/Source/WebCore/plugins/PluginMainThreadScheduler.cpp @@ -49,7 +49,7 @@ void PluginMainThreadScheduler::scheduleCall(NPP npp, MainThreadFunction functio if (it == m_callQueueMap.end()) return; - it->second.append(Call(function, userData)); + it->value.append(Call(function, userData)); if (!m_callPending) { callOnMainThread(mainThreadCallback, this); @@ -97,7 +97,7 @@ void PluginMainThreadScheduler::dispatchCalls() // Empty all the queues in the original map CallQueueMap::iterator end = m_callQueueMap.end(); for (CallQueueMap::iterator it = m_callQueueMap.begin(); it != end; ++it) - it->second.clear(); + it->value.clear(); } m_callPending = false; @@ -105,7 +105,7 @@ void PluginMainThreadScheduler::dispatchCalls() CallQueueMap::iterator end = copy.end(); for (CallQueueMap::iterator it = copy.begin(); it != end; ++it) - dispatchCallsForPlugin(it->first, it->second); + dispatchCallsForPlugin(it->key, it->value); } void PluginMainThreadScheduler::mainThreadCallback(void* context) |