summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-28 04:43:39 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-28 04:43:39 -0800
commit0c3fc76c46448caa6a3f227f6947a2401fa9defc (patch)
treea2c29def467a682d65fb084e69827f31f7ddb1f5
parent0b9c6cae188b85a4acb0ab600f5f64c253b4736e (diff)
parent4c5a70fa485baf5dc3dc43efc47e30b82fc79b77 (diff)
downloadexternal_webkit-0c3fc76c46448caa6a3f227f6947a2401fa9defc.zip
external_webkit-0c3fc76c46448caa6a3f227f6947a2401fa9defc.tar.gz
external_webkit-0c3fc76c46448caa6a3f227f6947a2401fa9defc.tar.bz2
Merge "Changes to make Bridge.h script-engine independent are complete"
-rw-r--r--WebCore/plugins/PluginView.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 89713b5..7b143e5 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -27,12 +27,7 @@
#include "config.h"
#include "PluginView.h"
-// ANDROID
-// Temporary guard required until Bridge.h is script-engine independent
-// See https://bugs.webkit.org/show_bug.cgi?id=32154
-#if USE(JSC)
#include "Bridge.h"
-#endif
#include "Document.h"
#include "DocumentLoader.h"
#include "Element.h"