Fix SVG build with V8.
Because some SVG anomation source files depend on generic sort functions,
we cannot compile them. Add as ENABLE_SVG_ANIMATION build flag to disable
SVG Animation.
diff --git a/Android.mk b/Android.mk
index 029b198..670b718 100644
--- a/Android.mk
+++ b/Android.mk
@@ -103,6 +103,11 @@
LOCAL_CFLAGS += -DENABLE_SVG=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/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk
index 70dac51..ce32839 100644
--- a/V8Binding/V8Binding.derived.mk
+++ b/V8Binding/V8Binding.derived.mk
@@ -492,14 +492,11 @@
$(intermediates)/svg/V8SVGUnitTypes.h \
$(intermediates)/svg/V8SVGUseElement.h \
$(intermediates)/svg/V8SVGViewElement.h \
- $(intermediates)/svg/V8SVGZoomEvent.h
-
-# $(intermediates)/svg/V8SVGAnimateColorElement.h \
- $(intermediates)/svg/V8SVGAnimateElement.h \
- $(intermediates)/svg/V8SVGAnimateTransformElement.h \
+ $(intermediates)/svg/V8SVGZoomEvent.h \
+ \
$(intermediates)/svg/V8SVGAnimatedAngle.h \
- $(intermediates)/svg/V8SVGAnimatedBoolean.h \
$(intermediates)/svg/V8SVGAnimatedEnumeration.h \
+ $(intermediates)/svg/V8SVGAnimatedBoolean.h \
$(intermediates)/svg/V8SVGAnimatedInteger.h \
$(intermediates)/svg/V8SVGAnimatedLength.h \
$(intermediates)/svg/V8SVGAnimatedLengthList.h \
@@ -509,10 +506,16 @@
$(intermediates)/svg/V8SVGAnimatedPreserveAspectRatio.h \
$(intermediates)/svg/V8SVGAnimatedRect.h \
$(intermediates)/svg/V8SVGAnimatedString.h \
- $(intermediates)/svg/V8SVGAnimatedTransformList.h \
- $(intermediates)/svg/V8SVGAnimationElement.h \
+ $(intermediates)/svg/V8SVGAnimatedTransformList.h
-# $(intermediates)/svg/V8SVGSetElement.h \
+ifeq ($(ENABLE_SVG_ANIMATION), true)
+GEN += \
+ $(intermediates)/svg/V8SVGAnimateColorElement.h \
+ $(intermediates)/svg/V8SVGAnimateElement.h \
+ $(intermediates)/svg/V8SVGAnimateTransformElement.h \
+ $(intermediates)/svg/V8SVGAnimationElement.h \
+ $(intermediates)/svg/V8SVGSetElement.h
+endif
$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(WEBCORE_PATH) perl -I$(v8binding_dir)/scripts -I$(WEBCORE_PATH)/bindings/scripts $(v8binding_dir)/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include css --include dom --include html --include svg --outputdir $(dir $@) $<
$(GEN): $(intermediates)/svg/V8%.h : $(WEBCORE_PATH)/svg/%.idl $(js_binding_scripts)
diff --git a/WebCore/config.h b/WebCore/config.h
index 6470466..8a4cf56 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -87,10 +87,12 @@
#define ENABLE_SVG 0
#endif
#if ENABLE_SVG
+#if !defined(ENABLE_SVG_ANIMATION)
#define ENABLE_SVG_ANIMATION 0 // to enable:
// fix error: no matching function for call to 'sort(WebCore::SVGSMILElement**, WebCore::SVGSMILElement**, WebCore::PriorityCompare)'
// fix error: no matching function for call to 'sort(WebCore::SMILTime*, WebCore::SMILTime*)'
// add ENABLE_SVG_ANIMATION=1 to SVG_FLAGS in JavaScriptCore.derived.mk
+#endif
#define ENABLE_SVG_AS_IMAGE 1
#define ENABLE_SVG_FILTERS 1
#define ENABLE_SVG_FONTS 1
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 4b8ff22..90fe989 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -961,38 +961,3 @@
notImplemented();
}
#endif
-
-
-#if ENABLE(SVG) && USE(V8)
-#include "V8SVGAnimatedAngle.h"
-#include "V8SVGAnimatedBoolean.h"
-#include "V8SVGAnimatedEnumeration.h"
-#include "V8SVGAnimatedInteger.h"
-#include "V8SVGAnimatedLength.h"
-#include "V8SVGAnimatedLengthList.h"
-#include "V8SVGAnimatedNumber.h"
-#include "V8SVGAnimatedNumberList.h"
-#include "V8SVGAnimatedPreserveAspectRatio.h"
-#include "V8SVGAnimatedRect.h"
-#include "V8SVGAnimatedString.h"
-#include "V8SVGAnimatedTransformList.h"
-
-namespace WebCore {
-static v8::Persistent<v8::FunctionTemplate> dummyFunctionTemplate;
-
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedAngle::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedBoolean::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedEnumeration::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedInteger::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedLength::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedLengthList::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedNumber::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedNumberList::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedPreserveAspectRatio::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedRect::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedString::GetTemplate(){ return dummyFunctionTemplate; }
-v8::Persistent<v8::FunctionTemplate> V8SVGAnimatedTransformList::GetTemplate(){ return dummyFunctionTemplate; }
-
-}
-#endif
-
