diff options
| author | Steve Block <steveblock@google.com> | 2010-04-28 16:09:50 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:13 +0100 |
| commit | 3b676932fc83bc9a3e8872fe42c2e64520ec5942 (patch) | |
| tree | 279100b3e2e19aca942915577c25bdc3b7f4e3f9 /WebCore/plugins | |
| parent | aea8a56bcd1ef4ddac866b6d02a4ecf707891dbc (diff) | |
| download | external_webkit-3b676932fc83bc9a3e8872fe42c2e64520ec5942.zip external_webkit-3b676932fc83bc9a3e8872fe42c2e64520ec5942.tar.gz external_webkit-3b676932fc83bc9a3e8872fe42c2e64520ec5942.tar.bz2 | |
Merge webkit.org at r58033 : Add JSC guards around calls to JSLock
This was added to WebKit in http://trac.webkit.org/changeset/55433. It does not
cause problems on Chromium as they exclude this file from the build.
Change-Id: I77e94d5c18d99fb24578416ef31e559f35386372
Diffstat (limited to 'WebCore/plugins')
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 0bc4b0e..889afe0 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -1491,7 +1491,11 @@ void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled) return; PluginView::setCurrentPluginView(this); +// ANDROID +// Upstream to webkit.org +#if USE(JSC) JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); +#endif setCallingPlugin(true); NPBool value = privateBrowsingEnabled; setValue(m_instance, NPNVprivateModeBool, &value); |