summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/plugins/android
diff options
context:
space:
mode:
authorSteve Block <steveblock@chromium.org>2012-02-16 10:07:32 +0000
committerSteve Block <steveblock@google.com>2012-02-16 12:19:54 +0000
commit9d5e9234a371d13bf55a779a6257ae5e277bfb1b (patch)
tree6a61ed35840162994c20fcf46726c75b8f96ac70 /Source/WebCore/plugins/android
parent072ed0a209fd8f03b226c5c0fcea994b587c1e66 (diff)
downloadexternal_webkit-9d5e9234a371d13bf55a779a6257ae5e277bfb1b.zip
external_webkit-9d5e9234a371d13bf55a779a6257ae5e277bfb1b.tar.gz
external_webkit-9d5e9234a371d13bf55a779a6257ae5e277bfb1b.tar.bz2
Remove JSC-specific code and V8 guards from Android-specific code
Also removes such code from downstream edits to non-Android-specific code. Bug: 5495373 Change-Id: I478824af2e6ff0eff9a43a9534c2a5ee0e99e9f8
Diffstat (limited to 'Source/WebCore/plugins/android')
-rw-r--r--Source/WebCore/plugins/android/PluginViewAndroid.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/WebCore/plugins/android/PluginViewAndroid.cpp b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
index dba7d3b..315d8a4 100644
--- a/Source/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -63,10 +63,6 @@
#include "ScriptController.h"
#include "Settings.h"
-#if USE(JSC)
-#include <runtime/JSLock.h>
-#endif
-
#include <wtf/ASCIICType.h>
// #include "runtime.h"
#include "WebViewCore.h"
@@ -484,9 +480,6 @@ void PluginView::setNPWindowIfNeeded()
m_npWindow.clipRect.bottom = m_pageRect.y() + m_pageRect.height();
if (m_plugin->pluginFuncs()->setwindow) {
-#if USE(JSC)
- JSC::JSLock::DropAllLocks dropAllLocks(false);
-#endif
setCallingPlugin(true);
m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
setCallingPlugin(false);