OSDN Git Service

Fix the random crash around iframes.
[android-x86/external-webkit.git] / WebCore / Android.derived.mk
index 843453c..c505908 100644 (file)
 #      css/RGBColor.idl \
 #      dom/EventListener.idl \
 #      dom/EventTarget.idl \
-#      dom/Worker*.idl \
 #      html/CanvasPixelArray.idl \
-#      html/HTMLAudioElement.idl \
-#      html/HTMLMediaElement.idl \
 #      page/AbstractView.idl \
-#      page/PositionCallback.idl \
-#      page/Worker*.idl \
+#      svg/ElementTimeControl.idl \
+#      svg/SVGAnimatedPathData.idl \
+#      svg/SVGAnimatedPoints.idl \
+#      svg/SVGExternalResourcesRequired.idl \
+#      svg/SVGFilterPrimitiveStandardAttributes.idl \
+#      svg/SVGFitToViewBox.idl \
+#      svg/SVGLangSpace.idl \
+#      svg/SVGLocatable.idl \
+#      svg/SVGStylable.idl \
+#      svg/SVGTests.idl \
+#      svg/SVGTransformable.idl \
+#      svg/SVGURIReference.idl \
+#      svg/SVGViewSpec.idl \
+#      svg/SVGZoomAndPan.idl \
 
 # This comment block is read by tools/webkitsync/diff.cpp
 # Don't remove it or move it. 
 #
 # The following files are intentionally not generated
 # LOCAL_GENERATED_FILES_EXCLUDED := \
-#      JSSVGElementWrapperFactory.cpp \
-#      JSWorkerContextBase.lut.h \
-#      SVGElementFactory.cpp \
-#      SVGNames.cpp \
 #      WMLElementFactory.cpp \
 #      WMLNames.cpp \
 #      XLinkNames.cpp \
 # The following directory wildcard matches are intentionally not included
 # If an entry starts with '/', any subdirectory may match
 # If an entry starts with '^', the first directory must match
-# LOCAL_DIR_WILDCARD_EXCLUDED := \
-#      ^storage/* \
-#      ^svg/* \
-#      ^workers/* \
+# LOCAL_DIR_WILDCARD_EXCLUDED :=
+#
 
 # This comment block is read by tools/webkitsync/diff.cpp
 # Don't remove it or move it. 
@@ -68,23 +71,29 @@ LOCAL_SRC_FILES :=
 
 GEN := $(intermediates)/css/CSSPropertyNames.h
 $(GEN): SCRIPT := $(LOCAL_PATH)/css/makeprop.pl
-$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.in
+$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.in $(LOCAL_PATH)/css/SVGCSSPropertyNames.in
        @echo "Generating CSSPropertyNames.h <= CSSPropertyNames.in"
        @mkdir -p $(dir $@)
-       @cp -f $< $(dir $@)
+       @cat $< > $(dir $@)/$(notdir $<)
+ifeq ($(ENABLE_SVG),true)
+       @cat $^ > $(@:%.h=%.in)
+endif
        @cp -f $(SCRIPT) $(dir $@)
        @cd $(dir $@) ; perl ./$(notdir $(SCRIPT))
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 GEN := $(intermediates)/css/CSSValueKeywords.h
 $(GEN): SCRIPT := $(LOCAL_PATH)/css/makevalues.pl
-$(GEN): PRIVATE_INTERMEDIATES := $(intermediates)
-$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.in
+$(GEN): $(intermediates)/%.h : $(LOCAL_PATH)/%.in $(LOCAL_PATH)/css/SVGCSSValueKeywords.in
        @echo "Generating CSSValueKeywords.h <= CSSValueKeywords.in"
-       mkdir -p $(dir $@)
-       cp -f $(SCRIPT) $(dir $@)
-       perl -ne 'print lc' $< > $(PRIVATE_INTERMEDIATES)/css/CSSValueKeywords.in
-       @cd $(PRIVATE_INTERMEDIATES)/css ; perl makevalues.pl
+       @mkdir -p $(dir $@)
+       @cp -f $(SCRIPT) $(dir $@)
+ifeq ($(ENABLE_SVG),true)    
+       @perl -ne 'print lc' $^ > $(@:%.h=%.in)
+else
+       @perl -ne 'print lc' $< > $(@:%.h=%.in)
+endif
+       @cd $(dir $@); perl makevalues.pl
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 
@@ -147,7 +156,10 @@ LOCAL_GENERATED_SOURCES += $(GEN)
                                 
 # user agent style sheets
 
-style_sheets := $(LOCAL_PATH)/css/html4.css $(LOCAL_PATH)/css/quirks.css $(LOCAL_PATH)/css/view-source.css
+style_sheets := $(LOCAL_PATH)/css/html.css $(LOCAL_PATH)/css/quirks.css $(LOCAL_PATH)/css/view-source.css $(LOCAL_PATH)/css/mediaControls.css
+ifeq ($(ENABLE_SVG), true)
+style_sheets := $(style_sheets) $(LOCAL_PATH)/css/svg.css
+endif
 GEN := $(intermediates)/css/UserAgentStyleSheets.h
 make_css_file_arrays := $(LOCAL_PATH)/css/make-css-file-arrays.pl
 $(GEN): PRIVATE_CUSTOM_TOOL = $< $@ $(basename $@).cpp $(filter %.css,$^)
@@ -176,7 +188,6 @@ create_hash_table := $(LOCAL_PATH)/../JavaScriptCore/create_hash_table
 
 GEN := $(addprefix $(intermediates)/, \
                        bindings/js/JSDOMWindowBase.lut.h \
-               bindings/js/JSRGBColor.lut.h \
                )
 $(GEN): PRIVATE_CUSTOM_TOOL = perl $(create_hash_table) $< > $@
 $(GEN): $(intermediates)/bindings/js/%.lut.h: $(LOCAL_PATH)/bindings/js/%.cpp $(create_hash_table)
@@ -198,7 +209,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
                        bindings/scripts/generate-bindings.pl \
                )
 
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1
+FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
 
 GEN := \
     $(intermediates)/css/JSCSSCharsetRule.h \
@@ -218,7 +229,9 @@ GEN := \
     $(intermediates)/css/JSCSSVariablesDeclaration.h \
     $(intermediates)/css/JSCSSVariablesRule.h \
     $(intermediates)/css/JSCounter.h \
+    $(intermediates)/css/JSMedia.h \
     $(intermediates)/css/JSMediaList.h \
+    $(intermediates)/css/JSRGBColor.h \
     $(intermediates)/css/JSRect.h \
     $(intermediates)/css/JSStyleSheet.h \
     $(intermediates)/css/JSStyleSheetList.h \
@@ -248,20 +261,21 @@ GEN := \
     $(intermediates)/dom/JSAttr.h \
     $(intermediates)/dom/JSCDATASection.h \
     $(intermediates)/dom/JSCharacterData.h \
+    $(intermediates)/dom/JSClientRect.h \
+    $(intermediates)/dom/JSClientRectList.h \
     $(intermediates)/dom/JSClipboard.h \
     $(intermediates)/dom/JSComment.h \
     $(intermediates)/dom/JSDOMCoreException.h \
     $(intermediates)/dom/JSDOMImplementation.h \
-    $(intermediates)/dom/JSDOMStringList.h \
     $(intermediates)/dom/JSDocument.h \
     $(intermediates)/dom/JSDocumentFragment.h \
     $(intermediates)/dom/JSDocumentType.h \
     $(intermediates)/dom/JSElement.h \
     $(intermediates)/dom/JSEntity.h \
     $(intermediates)/dom/JSEntityReference.h \
+    $(intermediates)/dom/JSErrorEvent.h \
     $(intermediates)/dom/JSEvent.h \
     $(intermediates)/dom/JSEventException.h \
-    $(intermediates)/dom/JSEventTargetNode.h \
     $(intermediates)/dom/JSKeyboardEvent.h \
     $(intermediates)/dom/JSMessageChannel.h \
     $(intermediates)/dom/JSMessageEvent.h \
@@ -274,7 +288,7 @@ GEN := \
     $(intermediates)/dom/JSNodeIterator.h \
     $(intermediates)/dom/JSNodeList.h \
     $(intermediates)/dom/JSNotation.h \
-       $(intermediates)/dom/JSOverflowEvent.h \
+    $(intermediates)/dom/JSOverflowEvent.h \
     $(intermediates)/dom/JSProcessingInstruction.h \
     $(intermediates)/dom/JSProgressEvent.h \
     $(intermediates)/dom/JSRange.h \
@@ -301,14 +315,14 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/
 
 
 GEN := \
-    $(intermediates)/html/JSCanvasGradient.h \
-    $(intermediates)/html/JSCanvasPattern.h \
-    $(intermediates)/html/JSCanvasRenderingContext2D.h \
+    $(intermediates)/html/JSDataGridColumn.h \
+    $(intermediates)/html/JSDataGridColumnList.h \
     $(intermediates)/html/JSFile.h \
     $(intermediates)/html/JSFileList.h \
     $(intermediates)/html/JSHTMLAnchorElement.h \
     $(intermediates)/html/JSHTMLAppletElement.h \
     $(intermediates)/html/JSHTMLAreaElement.h \
+    $(intermediates)/html/JSHTMLAudioElement.h \
     $(intermediates)/html/JSHTMLBRElement.h \
     $(intermediates)/html/JSHTMLBaseElement.h \
     $(intermediates)/html/JSHTMLBaseFontElement.h \
@@ -317,6 +331,10 @@ GEN := \
     $(intermediates)/html/JSHTMLButtonElement.h \
     $(intermediates)/html/JSHTMLCanvasElement.h \
        $(intermediates)/html/JSHTMLCollection.h \
+    $(intermediates)/html/JSHTMLDataGridElement.h \
+    $(intermediates)/html/JSHTMLDataGridCellElement.h \
+    $(intermediates)/html/JSHTMLDataGridColElement.h \
+    $(intermediates)/html/JSHTMLDataGridRowElement.h \
     $(intermediates)/html/JSHTMLDListElement.h \
     $(intermediates)/html/JSHTMLDirectoryElement.h \
     $(intermediates)/html/JSHTMLDivElement.h \
@@ -342,6 +360,7 @@ GEN := \
     $(intermediates)/html/JSHTMLLinkElement.h \
     $(intermediates)/html/JSHTMLMapElement.h \
     $(intermediates)/html/JSHTMLMarqueeElement.h \
+    $(intermediates)/html/JSHTMLMediaElement.h \
     $(intermediates)/html/JSHTMLMenuElement.h \
     $(intermediates)/html/JSHTMLMetaElement.h \
     $(intermediates)/html/JSHTMLModElement.h \
@@ -349,7 +368,7 @@ GEN := \
     $(intermediates)/html/JSHTMLObjectElement.h \
     $(intermediates)/html/JSHTMLOptGroupElement.h \
     $(intermediates)/html/JSHTMLOptionElement.h \
-       $(intermediates)/html/JSHTMLOptionsCollection.h \
+    $(intermediates)/html/JSHTMLOptionsCollection.h \
     $(intermediates)/html/JSHTMLParagraphElement.h \
     $(intermediates)/html/JSHTMLParamElement.h \
     $(intermediates)/html/JSHTMLPreElement.h \
@@ -372,6 +391,7 @@ GEN := \
     $(intermediates)/html/JSMediaError.h \
     $(intermediates)/html/JSTextMetrics.h \
     $(intermediates)/html/JSTimeRanges.h \
+    $(intermediates)/html/JSValidityState.h \
     $(intermediates)/html/JSVoidCallback.h 
 
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
@@ -385,6 +405,22 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/html/%.h
 
 GEN := \
+       $(intermediates)/html/canvas/JSCanvasGradient.h \
+       $(intermediates)/html/canvas/JSCanvasPattern.h \
+    $(intermediates)/html/canvas/JSCanvasRenderingContext2D.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 $@) $<
+$(GEN): $(intermediates)/html/canvas/JS%.h : $(LOCAL_PATH)/html/canvas/%.idl $(js_binding_scripts)
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/canvas/%.cpp : $(intermediates)/html/canvas/%.h
+
+GEN := \
+       $(intermediates)/inspector/JSInspectorBackend.h  \
     $(intermediates)/inspector/JSJavaScriptCallFrame.h 
     
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
@@ -414,16 +450,11 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(interme
 # out/.../JSAbstractView.cpp:27:26: error: AbstractView.h: No such file or directory
 # I can't find AbstractView.h anywhere
 #    $(intermediates)/page/JSAbstractView.h \
-#
-# also:
-#
-# out/.../JSPositionCallback.cpp:145: error: no matching function for call to 'WebCore::PositionCallback::handleEvent(WebCore::Geoposition*&)'
-#  note: candidates are: virtual void WebCore::PositionCallback::handleEvent(WebCore::Geoposition*, bool&)
-#    $(intermediates)/page/JSPositionCallback.h \
 
 GEN := \
     $(intermediates)/page/JSBarInfo.h \
     $(intermediates)/page/JSConsole.h \
+       $(intermediates)/page/JSCoordinates.h \
     $(intermediates)/page/JSDOMSelection.h \
     $(intermediates)/page/JSDOMWindow.h \
     $(intermediates)/page/JSGeolocation.h \
@@ -432,8 +463,10 @@ GEN := \
     $(intermediates)/page/JSLocation.h \
     $(intermediates)/page/JSNavigator.h \
     $(intermediates)/page/JSPositionError.h \
-    $(intermediates)/page/JSPositionErrorCallback.h \
-    $(intermediates)/page/JSScreen.h
+    $(intermediates)/page/JSScreen.h \
+    $(intermediates)/page/JSWebKitPoint.h \
+    $(intermediates)/page/JSWorkerNavigator.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 $@) $<
 $(GEN): $(intermediates)/page/JS%.h : $(LOCAL_PATH)/page/%.idl $(js_binding_scripts)
@@ -460,6 +493,206 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
 # above rules.  Specifying this explicitly makes -j2 work.
 $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/plugins/%.h
 
+# New section for Database storage API
+GEN := \
+    $(intermediates)/storage/JSDatabase.h \
+    $(intermediates)/storage/JSSQLError.h \
+    $(intermediates)/storage/JSSQLResultSet.h \
+    $(intermediates)/storage/JSSQLResultSetRowList.h \
+    $(intermediates)/storage/JSSQLTransaction.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 $@) $<
+$(GEN): $(intermediates)/storage/JS%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts)
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
+
+# new section for DOM Storage APIs
+GEN := \
+    $(intermediates)/storage/JSStorage.h \
+    $(intermediates)/storage/JSStorageEvent.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 $@) $<
+$(GEN): $(intermediates)/storage/JS%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts)
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
+
+#new section for svg
+ifeq ($(ENABLE_SVG), true)
+GEN := \
+    $(intermediates)/svg/JSSVGAElement.h \
+    $(intermediates)/svg/JSSVGAltGlyphElement.h \
+    $(intermediates)/svg/JSSVGAngle.h \
+    $(intermediates)/svg/JSSVGAnimateColorElement.h \
+    $(intermediates)/svg/JSSVGAnimateElement.h \
+    $(intermediates)/svg/JSSVGAnimateTransformElement.h \
+    $(intermediates)/svg/JSSVGAnimatedAngle.h \
+    $(intermediates)/svg/JSSVGAnimatedBoolean.h \
+    $(intermediates)/svg/JSSVGAnimatedEnumeration.h \
+    $(intermediates)/svg/JSSVGAnimatedInteger.h \
+    $(intermediates)/svg/JSSVGAnimatedLength.h \
+    $(intermediates)/svg/JSSVGAnimatedLengthList.h \
+    $(intermediates)/svg/JSSVGAnimatedNumber.h \
+    $(intermediates)/svg/JSSVGAnimatedNumberList.h \
+    $(intermediates)/svg/JSSVGAnimatedPreserveAspectRatio.h \
+    $(intermediates)/svg/JSSVGAnimatedRect.h \
+    $(intermediates)/svg/JSSVGAnimatedString.h \
+    $(intermediates)/svg/JSSVGAnimatedTransformList.h \
+    $(intermediates)/svg/JSSVGAnimationElement.h \
+    $(intermediates)/svg/JSSVGCircleElement.h \
+    $(intermediates)/svg/JSSVGClipPathElement.h \
+    $(intermediates)/svg/JSSVGColor.h \
+    $(intermediates)/svg/JSSVGComponentTransferFunctionElement.h \
+    $(intermediates)/svg/JSSVGCursorElement.h \
+    $(intermediates)/svg/JSSVGDefinitionSrcElement.h \
+    $(intermediates)/svg/JSSVGDefsElement.h \
+    $(intermediates)/svg/JSSVGDescElement.h \
+    $(intermediates)/svg/JSSVGDocument.h \
+    $(intermediates)/svg/JSSVGElement.h \
+    $(intermediates)/svg/JSSVGElementInstance.h \
+    $(intermediates)/svg/JSSVGElementInstanceList.h \
+    $(intermediates)/svg/JSSVGEllipseElement.h \
+    $(intermediates)/svg/JSSVGException.h \
+    $(intermediates)/svg/JSSVGFEBlendElement.h \
+    $(intermediates)/svg/JSSVGFEColorMatrixElement.h \
+    $(intermediates)/svg/JSSVGFEComponentTransferElement.h \
+    $(intermediates)/svg/JSSVGFECompositeElement.h \
+    $(intermediates)/svg/JSSVGFEDiffuseLightingElement.h \
+    $(intermediates)/svg/JSSVGFEDisplacementMapElement.h \
+    $(intermediates)/svg/JSSVGFEDistantLightElement.h \
+    $(intermediates)/svg/JSSVGFEFloodElement.h \
+    $(intermediates)/svg/JSSVGFEFuncAElement.h \
+    $(intermediates)/svg/JSSVGFEFuncBElement.h \
+    $(intermediates)/svg/JSSVGFEFuncGElement.h \
+    $(intermediates)/svg/JSSVGFEFuncRElement.h \
+    $(intermediates)/svg/JSSVGFEGaussianBlurElement.h \
+    $(intermediates)/svg/JSSVGFEImageElement.h \
+    $(intermediates)/svg/JSSVGFEMergeElement.h \
+    $(intermediates)/svg/JSSVGFEMergeNodeElement.h \
+    $(intermediates)/svg/JSSVGFEOffsetElement.h \
+    $(intermediates)/svg/JSSVGFEPointLightElement.h \
+    $(intermediates)/svg/JSSVGFESpecularLightingElement.h \
+    $(intermediates)/svg/JSSVGFESpotLightElement.h \
+    $(intermediates)/svg/JSSVGFETileElement.h \
+    $(intermediates)/svg/JSSVGFETurbulenceElement.h \
+    $(intermediates)/svg/JSSVGFilterElement.h \
+    $(intermediates)/svg/JSSVGFontElement.h \
+    $(intermediates)/svg/JSSVGFontFaceElement.h \
+    $(intermediates)/svg/JSSVGFontFaceFormatElement.h \
+    $(intermediates)/svg/JSSVGFontFaceNameElement.h \
+    $(intermediates)/svg/JSSVGFontFaceSrcElement.h \
+    $(intermediates)/svg/JSSVGFontFaceUriElement.h \
+    $(intermediates)/svg/JSSVGForeignObjectElement.h \
+    $(intermediates)/svg/JSSVGGElement.h \
+    $(intermediates)/svg/JSSVGGlyphElement.h \
+    $(intermediates)/svg/JSSVGGradientElement.h \
+    $(intermediates)/svg/JSSVGHKernElement.h \
+    $(intermediates)/svg/JSSVGImageElement.h \
+    $(intermediates)/svg/JSSVGLength.h \
+    $(intermediates)/svg/JSSVGLengthList.h \
+    $(intermediates)/svg/JSSVGLineElement.h \
+    $(intermediates)/svg/JSSVGLinearGradientElement.h \
+    $(intermediates)/svg/JSSVGMarkerElement.h \
+    $(intermediates)/svg/JSSVGMaskElement.h \
+    $(intermediates)/svg/JSSVGMatrix.h \
+    $(intermediates)/svg/JSSVGMetadataElement.h \
+    $(intermediates)/svg/JSSVGMissingGlyphElement.h \
+    $(intermediates)/svg/JSSVGNumber.h \
+    $(intermediates)/svg/JSSVGNumberList.h \
+    $(intermediates)/svg/JSSVGPaint.h \
+    $(intermediates)/svg/JSSVGPathElement.h \
+    $(intermediates)/svg/JSSVGPathSeg.h \
+    $(intermediates)/svg/JSSVGPathSegArcAbs.h \
+    $(intermediates)/svg/JSSVGPathSegArcRel.h \
+    $(intermediates)/svg/JSSVGPathSegClosePath.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoCubicAbs.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoCubicRel.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoCubicSmoothAbs.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoCubicSmoothRel.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticAbs.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticRel.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticSmoothAbs.h \
+    $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticSmoothRel.h \
+    $(intermediates)/svg/JSSVGPathSegLinetoAbs.h \
+    $(intermediates)/svg/JSSVGPathSegLinetoHorizontalAbs.h \
+    $(intermediates)/svg/JSSVGPathSegLinetoHorizontalRel.h \
+    $(intermediates)/svg/JSSVGPathSegLinetoRel.h \
+    $(intermediates)/svg/JSSVGPathSegLinetoVerticalAbs.h \
+    $(intermediates)/svg/JSSVGPathSegLinetoVerticalRel.h \
+    $(intermediates)/svg/JSSVGPathSegList.h \
+    $(intermediates)/svg/JSSVGPathSegMovetoAbs.h \
+    $(intermediates)/svg/JSSVGPathSegMovetoRel.h \
+    $(intermediates)/svg/JSSVGPatternElement.h \
+    $(intermediates)/svg/JSSVGPoint.h \
+    $(intermediates)/svg/JSSVGPointList.h \
+    $(intermediates)/svg/JSSVGPolygonElement.h \
+    $(intermediates)/svg/JSSVGPolylineElement.h \
+    $(intermediates)/svg/JSSVGPreserveAspectRatio.h \
+    $(intermediates)/svg/JSSVGRadialGradientElement.h \
+    $(intermediates)/svg/JSSVGRect.h \
+    $(intermediates)/svg/JSSVGRectElement.h \
+    $(intermediates)/svg/JSSVGRenderingIntent.h \
+    $(intermediates)/svg/JSSVGSVGElement.h \
+    $(intermediates)/svg/JSSVGScriptElement.h \
+    $(intermediates)/svg/JSSVGSetElement.h \
+    $(intermediates)/svg/JSSVGStopElement.h \
+    $(intermediates)/svg/JSSVGStringList.h \
+    $(intermediates)/svg/JSSVGStyleElement.h \
+    $(intermediates)/svg/JSSVGSwitchElement.h \
+    $(intermediates)/svg/JSSVGSymbolElement.h \
+    $(intermediates)/svg/JSSVGTRefElement.h \
+    $(intermediates)/svg/JSSVGTSpanElement.h \
+    $(intermediates)/svg/JSSVGTextContentElement.h \
+    $(intermediates)/svg/JSSVGTextElement.h \
+    $(intermediates)/svg/JSSVGTextPathElement.h \
+    $(intermediates)/svg/JSSVGTextPositioningElement.h \
+    $(intermediates)/svg/JSSVGTitleElement.h \
+    $(intermediates)/svg/JSSVGTransform.h \
+    $(intermediates)/svg/JSSVGTransformList.h \
+    $(intermediates)/svg/JSSVGUnitTypes.h \
+    $(intermediates)/svg/JSSVGUseElement.h \
+    $(intermediates)/svg/JSSVGViewElement.h \
+    $(intermediates)/svg/JSSVGZoomEvent.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 external/webkit/WebCore/dom --include external/webkit/WebCore/html --include external/webkit/WebCore/svg --outputdir $(dir $@) $<
+$(GEN): $(intermediates)/svg/JS%.h : $(LOCAL_PATH)/svg/%.idl $(js_binding_scripts)
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/svg/%.cpp : $(intermediates)/svg/%.h
+endif
+
+# new section for Workers
+GEN := \
+    $(intermediates)/workers/JSAbstractWorker.h \
+    $(intermediates)/workers/JSDedicatedWorkerContext.h \
+    $(intermediates)/workers/JSSharedWorker.h \
+    $(intermediates)/workers/JSSharedWorkerContext.h \
+       $(intermediates)/workers/JSWorker.h \
+    $(intermediates)/workers/JSWorkerContext.h \
+    $(intermediates)/workers/JSWorkerLocation.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 $@) $<
+$(GEN): $(intermediates)/workers/JS%.h : $(LOCAL_PATH)/workers/%.idl $(js_binding_scripts)
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/workers/%.cpp : $(intermediates)/workers/%.h
+
 #new section for xml/DOMParser.idl
 GEN := \
     $(intermediates)/xml/JSDOMParser.h \
@@ -469,6 +702,7 @@ GEN := \
     $(intermediates)/xml/JSXMLHttpRequestUpload.h \
     $(intermediates)/xml/JSXMLSerializer.h \
     $(intermediates)/xml/JSXPathEvaluator.h \
+       $(intermediates)/xml/JSXPathException.h \
     $(intermediates)/xml/JSXPathExpression.h \
     $(intermediates)/xml/JSXPathNSResolver.h \
     $(intermediates)/xml/JSXPathResult.h  \
@@ -486,15 +720,29 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/xml/%.cpp : $(intermediates)/xml/
 
 # HTML tag and attribute names
 
-GEN:= $(intermediates)/HTMLNames.cpp  $(intermediates)/JSHTMLElementWrapperFactory.cpp
+GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp  $(intermediates)/JSHTMLElementWrapperFactory.cpp
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(html_tags) --attrs $(html_attrs) --wrapperFactory --output $(dir $@) 
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(html_tags) --attrs $(html_attrs)  --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --output $(dir $@)
 $(GEN): html_tags := $(LOCAL_PATH)/html/HTMLTagNames.in
 $(GEN): html_attrs := $(LOCAL_PATH)/html/HTMLAttributeNames.in
 $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(html_tags) $(html_attrs)
        $(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
+# SVG tag and attribute names
+
+ifeq ($(ENABLE_SVG), true)
+GEN:= $(intermediates)/SVGNames.cpp  $(intermediates)/SVGElementFactory.cpp $(intermediates)/JSSVGElementWrapperFactory.cpp
+SVG_FLAGS:=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 $(svg_tags) --attrs $(svg_attrs) --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@) 
+$(GEN): svg_tags := $(LOCAL_PATH)/svg/svgtags.in
+$(GEN): svg_attrs := $(LOCAL_PATH)/svg/svgattrs.in
+$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(svg_tags) $(svg_attrs)
+       $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+endif
+
 # XML attribute names
 
 GEN:= $(intermediates)/XMLNames.cpp
@@ -505,7 +753,14 @@ $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(xml_attrs)
        $(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 
-GEN:= $(intermediates)/ksvgcssproperties.h
-$(GEN): 
-       @echo > $@
+# XLink attribute names
+
+ifeq ($(ENABLE_SVG), true)
+GEN:= $(intermediates)/XLinkNames.cpp
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --attrs $(xlink_attrs) --output $(dir $@) 
+$(GEN): xlink_attrs := $(LOCAL_PATH)/svg/xlinkattrs.in
+$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(xlink_attrs)
+       $(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
+endif