Merge the chrome_webkit_merge_branch back on to trunk. This brings us

up to webkit@36102.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 60 insertions, 34 deletions

diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index bff0853..b62ceca 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -642,6 +642,7 @@ all : \
     V8CSSValueList.h \
     V8CanvasGradient.h \
     V8CanvasPattern.h \
+    V8CanvasPixelArray.h \
     V8CanvasRenderingContext2D.h \
     V8CharacterData.h \
     V8Comment.h \
@@ -663,6 +664,8 @@ all : \
     V8Event.h \
     V8EventException.h \
     V8EventTargetNode.h \
+    V8File.h \
+    V8FileList.h \
     V8HTMLAnchorElement.h \
     V8HTMLAppletElement.h \
     V8HTMLAreaElement.h \
@@ -724,6 +727,7 @@ all : \
     V8HTMLTitleElement.h \
     V8HTMLUListElement.h \
     V8History.h \
+    V8ImageData.h \
     V8KeyboardEvent.h \
     V8MediaList.h \
     V8MessageEvent.h \
@@ -735,6 +739,7 @@ all : \
     V8NodeIterator.h \
     V8NodeList.h \
     V8Notation.h \
+    V8NSResolver.h \
     V8OverflowEvent.h \
     V8ProcessingInstruction.h \
     V8ProgressEvent.h \
@@ -878,12 +883,14 @@ all : \
     V8StyleSheet.h \
     V8StyleSheetList.h \
     V8Text.h \
+    V8TextMetrics.h \
     V8TextEvent.h \
     V8TreeWalker.h \
     V8UIEvent.h \
     V8VoidCallback.h \
     V8WheelEvent.h \
     V8XMLHttpRequest.h \
+    V8XMLHttpRequestUpload.h \
     V8XMLHttpRequestException.h \
     V8XMLSerializer.h \
     V8XPathEvaluator.h \
@@ -918,24 +925,24 @@ ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
 CSSPropertyNames.h : css/CSSPropertyNames.in css/SVGCSSPropertyNames.in
 	if sort $< $(WebCore)/css/SVGCSSPropertyNames.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
 	cat $< $(WebCore)/css/SVGCSSPropertyNames.in > CSSPropertyNames.in
-	perl "$(WebCore)/../../../webkit/pending/makeprop.pl"
+	perl "$(WebCore)/css/makeprop.pl"
 
 CSSValueKeywords.h : css/CSSValueKeywords.in css/SVGCSSValueKeywords.in
 	# Lower case all the values, as CSS values are case-insensitive
 	perl -ne 'print lc' $(WebCore)/css/SVGCSSValueKeywords.in > SVGCSSValueKeywords.in
 	if sort $< SVGCSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
 	cat $< SVGCSSValueKeywords.in > CSSValueKeywords.in
-	perl "$(WebCore)/../../../webkit/pending/makevalues.pl"
+	perl "$(WebCore)/css/makevalues.pl"
 
 else
 
-CSSPropertyNames.h : css/CSSPropertyNames.in ../../../webkit/pending/makeprop.pl
+CSSPropertyNames.h : css/CSSPropertyNames.in css/makeprop.pl
 	cp $< CSSPropertyNames.in
-	perl "$(WebCore)/../../../webkit/pending/makeprop.pl"
+	perl "$(WebCore)/css/makeprop.pl"
 
-CSSValueKeywords.h : css/CSSValueKeywords.in ../../../webkit/pending/makevalues.pl
+CSSValueKeywords.h : css/CSSValueKeywords.in css/makevalues.pl
 	cp $< CSSValueKeywords.in
-	perl "$(WebCore)/../../../pending/makevalues.pl"
+	perl "$(WebCore)/css/makevalues.pl"
 
 endif 
 
@@ -1009,62 +1016,79 @@ CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/char
 %Table.cpp: %.cpp $(CREATE_HASH_TABLE)
 	$(CREATE_HASH_TABLE) $< > $@
 
+# --------
+
 # HTML tag and attribute names
 
+ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)
+    HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO=1
+endif
+
+ifdef HTML_FLAGS
+
+HTMLNames.cpp : dom/make_names.pl html/HTMLTagNames.in html/HTMLAttributeNames.in
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(PORTROOT)/../pending/HTMLAttributeNames.in --extraDefines "$(HTML_FLAGS)"
+
+else
+
 HTMLNames.cpp : dom/make_names.pl html/HTMLTagNames.in html/HTMLAttributeNames.in
-	perl $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in \
-            --namespace HTML --namespacePrefix xhtml --cppNamespace WebCore --namespaceURI "http://www.w3.org/1999/xhtml" --attrsNullNamespace --output .
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(PORTROOT)/../pending/HTMLAttributeNames.in
+
+endif
 
 XMLNames.cpp : dom/make_names.pl xml/xmlattrs.in
-	perl $< --attrs $(WebCore)/xml/xmlattrs.in \
-            --namespace XML --cppNamespace WebCore --namespaceURI "http://www.w3.org/XML/1998/namespace" --output .
+	perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in
+
+# --------
 
 ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG)
 
+WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.exp
+
 ifeq ($(findstring ENABLE_SVG_USE,$(FEATURE_DEFINES)), ENABLE_SVG_USE)
-  SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_USE=1
+    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_USE=1
 endif
 
 ifeq ($(findstring ENABLE_SVG_FONTS,$(FEATURE_DEFINES)), ENABLE_SVG_FONTS)
-  SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=1
+    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=1
 endif
 
 ifeq ($(findstring ENABLE_SVG_FILTERS,$(FEATURE_DEFINES)), ENABLE_SVG_FILTERS)
-  SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FILTERS=1
+    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FILTERS=1
+    WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.Filters.exp
 endif
 
 ifeq ($(findstring ENABLE_SVG_AS_IMAGE,$(FEATURE_DEFINES)), ENABLE_SVG_AS_IMAGE)
-  SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_AS_IMAGE=1
+    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_AS_IMAGE=1
 endif
-  
+
 ifeq ($(findstring ENABLE_SVG_ANIMATION,$(FEATURE_DEFINES)), ENABLE_SVG_ANIMATION)
-  SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_ANIMATION=1
-  endif
+    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_ANIMATION=1
+    WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.Animation.exp
+endif
 
 ifeq ($(findstring ENABLE_SVG_FOREIGN_OBJECT,$(FEATURE_DEFINES)), ENABLE_SVG_FOREIGN_OBJECT)
-  SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FOREIGN_OBJECT=1
+    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FOREIGN_OBJECT=1
+    WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.ForeignObject.exp
 endif
 
 # SVG tag and attribute names (need to pass an extra flag if svg experimental features are enabled)
+
 ifdef SVG_FLAGS
+
 SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in
-	perl $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" \
-            --namespace SVG --cppNamespace WebCore --namespaceURI "http://www.w3.org/2000/svg" --factory --attrsNullNamespace --output .
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)"
 else
-# SVG tag and attribute names
+
 SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in
-	perl $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in \
-            --namespace SVG --cppNamespace WebCore --namespaceURI "http://www.w3.org/2000/svg" --factory --attrsNullNamespace --output .
-endif
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in
 
-XLinkNames.cpp : dom/make_names.pl svg/xlinkattrs.in
-	perl $< --attrs $(WebCore)/svg/xlinkattrs.in \
-            --namespace XLink --cppNamespace WebCore --namespaceURI "http://www.w3.org/1999/xlink" --output .
+endif
 
-# Add SVG Symbols to the WebCore exported symbols file
+JSSVGElementWrapperFactory.cpp : SVGNames.cpp
 
-WebCore.exp : WebCore.base.exp WebCore.SVG.exp
-	cat $^ > $@
+XLinkNames.cpp : dom/make_names.pl svg/xlinkattrs.in
+	perl -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in
 
 else
 
@@ -1077,8 +1101,10 @@ SVGNames.cpp :
 XLinkNames.cpp :
 	echo > $@
 
-WebCore.exp : WebCore.base.exp
-	cat $^ > $@
+# This file is autogenerated by make_names.pl when SVG is enabled.
+
+JSSVGElementWrapperFactory.cpp :
+	echo > $@
 
 endif
 
@@ -1110,7 +1136,7 @@ JS%.h : %.idl $(JS_BINDINGS_SCRIPTS)
 
 # new-style V8 bindings
 
-V8_BINDINGS_SCRIPTS = \
+V8_SCRIPTS = \
     $(PORTROOT)/bindings/scripts/CodeGenerator.pm \
     $(PORTROOT)/bindings/scripts/CodeGeneratorV8.pm \
     $(PORTROOT)/bindings/scripts/IDLParser.pm \
@@ -1120,7 +1146,7 @@ V8_BINDINGS_SCRIPTS = \
 
 # Sometimes script silently fails (Cygwin problem?), 
 # use a bounded loop to retry if so, but not do so forever.
-V8%.h : %.idl $(V8_BINDINGS_SCRIPTS)
+V8%.h : %.idl $(V8_SCRIPTS)
 	for i in 1 2 3 4 5 6 7 8 9 10; do \
 	  if test -e $@; then break; fi; \
 	  perl -w -I $(PORTROOT)/bindings/scripts -I $(WebCore)/bindings/scripts $(PORTROOT)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT V8_BINDING" --generator V8 --include ../../../webkit/pending --include ../../../webkit/port/dom --include ../../../webkit/port/html --include ../../../webkit/port/page --include ../../../webkit/port/xml --include svg --include dom --include html --include css --include page --include xml --outputdir . $< ; \