diff options
| -rw-r--r-- | Android.mk | 13 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 6 | ||||
| -rw-r--r-- | WebCore/loader/EmptyClients.h | 9 |
5 files changed, 18 insertions, 13 deletions
@@ -25,6 +25,12 @@ LOCAL_PATH := $(call my-dir) +# Control SVG compiling in webkit. +# Default is true unless explictly disabled. +ifneq ($(ENABLE_SVG),false) + ENABLE_SVG = true +endif + # Two ways to control which JS engine is used: # 1. use JS_ENGINE environment variable, value can be either 'jsc' or 'v8' # This is the preferred way. @@ -245,7 +251,7 @@ LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE endif ifeq ($(ENABLE_SVG),true) -LOCAL_CFLAGS += -DENABLE_SVG=1 +LOCAL_CFLAGS += -DENABLE_SVG=1 -DENABLE_SVG_ANIMATION=1 endif ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),false) @@ -256,11 +262,6 @@ ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),true) LOCAL_CFLAGS += -DWTF_USE_ACCELERATED_COMPOSITING=1 endif -# Temporary disable SVG_ANIMATION. -ifeq ($(ENABLE_SVG_ANIMATION),true) -LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1 -endif - ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_CFLAGS += -DANDROID_INSTRUMENT endif diff --git a/CleanSpec.mk b/CleanSpec.mk index 7b7b3c9..02b4dea 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -51,6 +51,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_int $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index b06a0f2..e9afc68 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -567,7 +567,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) ifeq ($(ENABLE_SVG), true) GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGNames.h $(intermediates)/SVGElementFactory.cpp $(intermediates)/SVGElementFactory.h $(intermediates)/JSSVGElementWrapperFactory.cpp $(intermediates)/JSSVGElementWrapperFactory.h -SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1 +SVG_FLAGS:=ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1 $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/svg/svgtags.in --attrs $(PRIVATE_PATH)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@) $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/svg/svgtags.in $(LOCAL_PATH)/svg/svgattrs.in diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 18e8d68..553de07 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -378,7 +378,6 @@ GEN += \ $(intermediates)/bindings/V8SVGCursorElement.h \ $(intermediates)/bindings/V8SVGDefsElement.h \ $(intermediates)/bindings/V8SVGDescElement.h \ - $(intermediates)/bindings/V8SVGElement.h \ $(intermediates)/bindings/V8SVGElementInstanceList.h \ $(intermediates)/bindings/V8SVGEllipseElement.h \ $(intermediates)/bindings/V8SVGFEBlendElement.h \ @@ -425,6 +424,7 @@ GEN += \ $(intermediates)/bindings/V8SVGMatrix.h \ $(intermediates)/bindings/V8SVGMetadataElement.h \ $(intermediates)/bindings/V8SVGMissingGlyphElement.h \ + $(intermediates)/bindings/V8SVGFEMorphologyElement.h \ $(intermediates)/bindings/V8SVGNumber.h \ $(intermediates)/bindings/V8SVGNumberList.h \ $(intermediates)/bindings/V8SVGPathElement.h \ @@ -495,7 +495,7 @@ GEN += \ $(intermediates)/bindings/V8SVGAnimatedTransformList.h endif -ifeq ($(ENABLE_SVG_ANIMATION), true) +ifeq ($(ENABLE_SVG), true) GEN += \ $(intermediates)/bindings/V8SVGAnimateColorElement.h \ $(intermediates)/bindings/V8SVGAnimateElement.h \ @@ -619,7 +619,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # SVG tag and attribute names ifeq ($(ENABLE_SVG), true) GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGNames.h $(intermediates)/SVGElementFactory.cpp $(intermediates)/SVGElementFactory.h $(intermediates)/V8SVGElementWrapperFactory.cpp $(intermediates)/V8SVGElementWrapperFactory.h -SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1 +SVG_FLAGS:=ENABLE_SVG_ANIMATION=1 ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1 $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/svg/svgtags.in --attrs $(PRIVATE_PATH)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactoryV8 --output $(dir $@) $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/svg/svgtags.in $(LOCAL_PATH)/svg/svgattrs.in diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index 6004b55..0d25818 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -314,14 +314,18 @@ public: virtual void documentElementAvailable() { } virtual void didPerformFirstNavigation() const { } - virtual void registerForIconNotification(bool) { } - #if USE(V8) virtual void didCreateScriptContextForFrame() { } virtual void didDestroyScriptContextForFrame() { } virtual void didCreateIsolatedScriptContext() { } #endif + virtual void registerForIconNotification(bool) { } + +#ifdef ANDROID_APPLE_TOUCH_ICON + virtual void dispatchDidReceiveTouchIconURL(const String& url, bool precomposed) { } +#endif + #if PLATFORM(MAC) virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long, NSCachedURLResponse* response) const { return response; } #endif @@ -505,4 +509,3 @@ public: } #endif // EmptyClients_h - |