diff options
| author | Andrei Popescu <andreip@google.com> | 2010-01-25 12:15:50 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2010-01-25 12:15:50 +0000 |
| commit | 5106648b32c4af91bb26f2a5af60a2c1eac14a78 (patch) | |
| tree | 2af4a1b513971191a1898440bd5944a2c5ec125f | |
| parent | dcb9f821994a3c585bc51d6f1a6a356a6034de5b (diff) | |
| download | external_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.
| -rw-r--r-- | Android.mk | 15 | ||||
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 1 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/PlatformBridge.cpp | 4 |
4 files changed, 11 insertions, 10 deletions
@@ -110,6 +110,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/platform/animation \ $(LOCAL_PATH)/WebCore/platform/graphics \ $(LOCAL_PATH)/WebCore/platform/graphics/android \ + $(LOCAL_PATH)/WebCore/platform/graphics/filters \ $(LOCAL_PATH)/WebCore/platform/graphics/network \ $(LOCAL_PATH)/WebCore/platform/graphics/skia \ $(LOCAL_PATH)/WebCore/platform/graphics/transforms \ @@ -124,6 +125,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/rendering \ $(LOCAL_PATH)/WebCore/rendering/style \ $(LOCAL_PATH)/WebCore/storage \ + $(LOCAL_PATH)/WebCore/svg \ + $(LOCAL_PATH)/WebCore/svg/animation \ + $(LOCAL_PATH)/WebCore/svg/graphics \ + $(LOCAL_PATH)/WebCore/svg/graphics/filters \ $(LOCAL_PATH)/WebCore/workers \ $(LOCAL_PATH)/WebCore/xml @@ -146,16 +151,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(base_intermediates)/WebCore/html \ $(base_intermediates)/WebCore/platform -ifeq ($(ENABLE_SVG), true) -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(LOCAL_PATH)/WebCore/platform/graphics/filters \ - $(LOCAL_PATH)/WebCore/svg \ - $(LOCAL_PATH)/WebCore/svg/animation \ - $(LOCAL_PATH)/WebCore/svg/graphics \ - $(LOCAL_PATH)/WebCore/svg/graphics/filters \ - $(base_intermediates)/WebCore/svg -endif - ifeq ($(JAVASCRIPT_ENGINE),v8) # Include WTF source file. d := JavaScriptCore diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 428f99a..59daf8d 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -53,6 +53,7 @@ BINDING_C_INCLUDES := \ $(base_intermediates)/WebCore/page \ $(base_intermediates)/WebCore/plugins \ $(base_intermediates)/WebCore/storage \ + $(base_intermediates)/WebCore/svg \ $(base_intermediates)/WebCore/workers \ $(base_intermediates)/WebCore/xml diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index d5eb37a..683de78 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -33,6 +33,7 @@ BINDING_C_INCLUDES := \ $(LOCAL_PATH)/bridge \ \ $(base_intermediates)/WebCore/bindings \ + $(base_intermediates)/WebCore/svg \ $(base_intermediates)/JavaScriptCore LOCAL_SRC_FILES += \ 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() |