diff options
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 30 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 30 | ||||
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 6 | ||||
| -rw-r--r-- | WebCore/Android.mk | 12 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 2 |
5 files changed, 59 insertions, 21 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 1929729..a8348f3 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -327,10 +327,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/page/%.cpp : $(intermediates)/page/%.h GEN := \ - $(intermediates)/plugins/JSMimeType.h \ - $(intermediates)/plugins/JSMimeTypeArray.h \ - $(intermediates)/plugins/JSPlugin.h \ - $(intermediates)/plugins/JSPluginArray.h + $(intermediates)/plugins/JSDOMMimeType.h \ + $(intermediates)/plugins/JSDOMMimeTypeArray.h \ + $(intermediates)/plugins/JSDOMPlugin.h \ + $(intermediates)/plugins/JSDOMPluginArray.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< @@ -627,12 +627,32 @@ LOCAL_GENERATED_SOURCES += $(GEN) # SVG tag and attribute names +# Note that if SVG is not used, we still need the headers and SVGNames.cpp as +# the HTML5 parser still requires these. The factory .cpp files are also +# generated in this case, but since these are not needed, they are excluded +# from GEN so that they don't get compiled. ifeq ($(ENABLE_SVG), true) GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGNames.h $(intermediates)/SVGElementFactory.cpp $(intermediates)/SVGElementFactory.h $(intermediates)/JSSVGElementWrapperFactory.cpp $(intermediates)/JSSVGElementWrapperFactory.h +else +GEN:= $(intermediates)/SVGNames.h $(intermediates)/SVGNames.cpp $(intermediates)/SVGElementFactory.h $(intermediates)/JSSVGElementWrapperFactory.h +endif 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 $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -endif + +# MathML tag and attribute names + +# Note that MathML is never used but we still need the headers and +# MathMLames.cpp as the HTML5 parser still requires these. The factory +# .cpp files are also generated in this case, but since these are not +# needed, they are excluded from GEN so that they don't get compiled. +GEN:= $(intermediates)/MathMLNames.h $(intermediates)/MathMLNames.cpp $(intermediates)/MathMLElementFactory.h $(intermediates)/JSMathMLElementWrapperFactory.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/mathml/mathtags.in --attrs $(PRIVATE_PATH)/mathml/mathattrs.in --factory --wrapperFactory --output $(dir $@) +$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/mathml/mathtags.in $(LOCAL_PATH)/mathml/mathattrs.in + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index c1065fa..d71482b 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -321,10 +321,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h GEN := \ - $(intermediates)/bindings/V8MimeType.h \ - $(intermediates)/bindings/V8MimeTypeArray.h \ - $(intermediates)/bindings/V8Plugin.h \ - $(intermediates)/bindings/V8PluginArray.h + $(intermediates)/bindings/V8DOMMimeType.h \ + $(intermediates)/bindings/V8DOMMimeTypeArray.h \ + $(intermediates)/bindings/V8DOMPlugin.h \ + $(intermediates)/bindings/V8DOMPluginArray.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< @@ -666,12 +666,32 @@ $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/html/HTMLTagNames.in $(LOC LOCAL_GENERATED_SOURCES += $(GEN) # SVG tag and attribute names + +# Note that if SVG is not used, we still need the headers and SVGNames.cpp as +# the HTML5 parser still requires these. The factory .cpp files are also +# generated in this case, but since these are not needed, they are excluded +# from GEN so that they don't get compiled. ifeq ($(ENABLE_SVG), true) GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGNames.h $(intermediates)/SVGElementFactory.cpp $(intermediates)/SVGElementFactory.h $(intermediates)/V8SVGElementWrapperFactory.cpp $(intermediates)/V8SVGElementWrapperFactory.h +else +GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGNames.h $(intermediates)/SVGElementFactory.h $(intermediates)/V8SVGElementWrapperFactory.h +endif 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 $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -endif + +# MathML tag and attribute names + +# Note that MathML is never used but we still need the headers and +# MathMLames.cpp as the HTML5 parser still requires these. The factory +# .cpp files are also generated in this case, but since these are not +# needed, they are excluded from GEN so that they don't get compiled. +GEN:= $(intermediates)/MathMLNames.h $(intermediates)/MathMLNames.cpp $(intermediates)/MathMLElementFactory.h $(intermediates)/V8MathMLElementWrapperFactory.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/mathml/mathtags.in --attrs $(PRIVATE_PATH)/mathml/mathattrs.in --factory --wrapperFactoryV8 --output $(dir $@) +$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/mathml/mathtags.in $(LOCAL_PATH)/mathml/mathattrs.in + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 5983450..d79ea79 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -86,6 +86,9 @@ LOCAL_SRC_FILES += \ bindings/js/JSDOMBinding.cpp \ bindings/js/JSDOMFormDataCustom.cpp \ bindings/js/JSDOMGlobalObject.cpp \ + bindings/js/JSDOMMimeTypeArrayCustom.cpp \ + bindings/js/JSDOMPluginArrayCustom.cpp \ + bindings/js/JSDOMPluginCustom.cpp \ bindings/js/JSDOMStringMapCustom.cpp \ bindings/js/JSDOMWindowBase.cpp \ bindings/js/JSDOMWindowCustom.cpp \ @@ -130,7 +133,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSMessageChannelCustom.cpp \ bindings/js/JSMessageEventCustom.cpp \ bindings/js/JSMessagePortCustom.cpp \ - bindings/js/JSMimeTypeArrayCustom.cpp \ bindings/js/JSNamedNodeMapCustom.cpp \ bindings/js/JSNavigatorCustom.cpp \ bindings/js/JSNodeCustom.cpp \ @@ -139,8 +141,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSNodeIteratorCustom.cpp \ bindings/js/JSNodeListCustom.cpp \ bindings/js/JSOptionConstructor.cpp \ - bindings/js/JSPluginArrayCustom.cpp \ - bindings/js/JSPluginCustom.cpp \ bindings/js/JSPluginElementFunctions.cpp \ bindings/js/JSPopStateEventCustom.cpp \ bindings/js/JSSQLResultSetRowListCustom.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 26eb405..df10d8c 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -104,7 +104,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/BeforeUnloadEvent.cpp \ dom/CDATASection.cpp \ dom/CSSMappedAttributeDeclaration.cpp \ - dom/CanvasSurface.cpp \ dom/CharacterData.cpp \ dom/CheckedRadioButtons.cpp \ dom/ChildNodeList.cpp \ @@ -245,7 +244,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ editing/markup.cpp \ editing/visible_units.cpp \ \ - history/BackForwardList.cpp \ + history/BackForwardController.cpp \ + history/BackForwardListImpl.cpp \ history/CachedFrame.cpp \ history/CachedPage.cpp \ history/HistoryItem.cpp \ @@ -613,10 +613,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ platform/text/transcoder/FontTranscoder.cpp \ \ - plugins/MimeType.cpp \ - plugins/MimeTypeArray.cpp \ - plugins/Plugin.cpp \ - plugins/PluginArray.cpp \ + plugins/DOMMimeType.cpp \ + plugins/DOMMimeTypeArray.cpp \ + plugins/DOMPlugin.cpp \ + plugins/DOMPluginArray.cpp \ plugins/PluginData.cpp \ plugins/PluginDatabase.cpp \ plugins/PluginMainThreadScheduler.cpp \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index e887747..a64d75e 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -127,8 +127,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8Float32ArrayCustom.cpp \ bindings/v8/custom/V8GeolocationCustom.cpp \ bindings/v8/custom/V8HistoryCustom.cpp \ - bindings/v8/custom/V8IDBAny.cpp \ - bindings/v8/custom/V8IDBKey.cpp \ bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \ bindings/v8/custom/V8HTMLAudioElementConstructor.cpp \ bindings/v8/custom/V8HTMLCanvasElementCustom.cpp \ |