summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2010-01-25 12:15:50 +0000
committerAndrei Popescu <andreip@google.com>2010-01-25 12:15:50 +0000
commit5106648b32c4af91bb26f2a5af60a2c1eac14a78 (patch)
tree2af4a1b513971191a1898440bd5944a2c5ec125f /WebKit/android/WebCoreSupport
parentdcb9f821994a3c585bc51d6f1a6a356a6034de5b (diff)
downloadexternal_webkit-5106648b32c4af91bb26f2a5af60a2c1eac14a78.zip
external_webkit-5106648b32c4af91bb26f2a5af60a2c1eac14a78.tar.gz
external_webkit-5106648b32c4af91bb26f2a5af60a2c1eac14a78.tar.bz2
Fix build by
- adding WebCore/svg to the include path. This should not be guarded by #if ENABLE(SVG) in the makefiles. - calling PluginView::getNPObject from PlatformBridge only when V8 is used.
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/PlatformBridge.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 9f620e7..b91a5d8 100644
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -102,11 +102,15 @@ bool PlatformBridge::cookiesEnabled()
NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
{
+#if USE(V8)
if (!widget->isPluginView())
return 0;
PluginView* pluginView = static_cast<PluginView*>(widget);
return pluginView->getNPObject();
+#else
+ return 0;
+#endif
}
bool PlatformBridge::isWebViewPaused()