diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebCore/plugins/PluginView.cpp | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebCore/plugins/PluginView.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp index d37573e67..0d6857f25 100644 --- a/Source/WebCore/plugins/PluginView.cpp +++ b/Source/WebCore/plugins/PluginView.cpp @@ -240,7 +240,7 @@ bool PluginView::start() { PluginView::setCurrentPluginView(this); #if USE(JSC) - JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); + JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData()); #endif setCallingPlugin(true); npErr = m_plugin->pluginFuncs()->newp((NPMIMEType)m_mimeType.utf8().data(), m_instance, m_mode, m_paramCount, m_paramNames, m_paramValues, NULL); @@ -330,7 +330,7 @@ void PluginView::stop() m_isStarted = false; #if USE(JSC) - JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); + JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData()); #endif #if ENABLE(NETSCAPE_PLUGIN_API) @@ -446,7 +446,7 @@ void PluginView::performRequest(PluginRequest* request) if (request->sendNotification()) { PluginView::setCurrentPluginView(this); #if USE(JSC) - JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); + JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData()); #endif setCallingPlugin(true); m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string().utf8().data(), NPRES_DONE, request->notifyData()); @@ -736,7 +736,7 @@ NPObject* PluginView::npObject() { PluginView::setCurrentPluginView(this); #if USE(JSC) - JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); + JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData()); #endif setCallingPlugin(true); npErr = m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginScriptableNPObject, &object); @@ -1492,7 +1492,7 @@ void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled) PluginView::setCurrentPluginView(this); #if USE(JSC) - JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); + JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonJSGlobalData()); #endif setCallingPlugin(true); NPBool value = privateBrowsingEnabled; |