Update DerivedSources.make to match modified WebKit scripts. This allows us to unfork HTMLAttributeNames.in, since the upstream patch I pulled into our third_party directory supersedes the change we made locally.

This also reverts my earlier change to the include order in webkit_common.vsprops, which should now no longer be necessary.
Review URL: http://codereview.chromium.org/7116

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

4 files changed, 6 insertions, 218 deletions

diff --git a/DEPS b/DEPS
index 75d9313..2c9fbb5 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@3216",
+    "/trunk/deps/third_party/WebKit@3297",
 
   "src/third_party/cygwin":
     "/trunk/deps/third_party/cygwin@3248",
diff --git a/webkit/build/webkit_common.vsprops b/webkit/build/webkit_common.vsprops
index 15be177..0fb2e13 100644
--- a/webkit/build/webkit_common.vsprops
+++ b/webkit/build/webkit_common.vsprops
@@ -3,6 +3,6 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="webkit_common"
-	InheritedPropertySheets=".\js_engine$(JS_ENGINE_TYPE).vsprops;.\webkit_common_includes.vsprops;.\webkit_common_defines.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops"
+	InheritedPropertySheets=".\webkit_common_includes.vsprops;.\webkit_common_defines.vsprops;.\js_engine$(JS_ENGINE_TYPE).vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops"
 	>
 </VisualStudioPropertySheet>
diff --git a/webkit/pending/HTMLAttributeNames.in b/webkit/pending/HTMLAttributeNames.in
deleted file mode 100644
index 9d14b683..0000000
--- a/webkit/pending/HTMLAttributeNames.in
+++ /dev/null
@@ -1,212 +0,0 @@
-namespace="HTML"
-namespacePrefix="xhtml"
-cppNamespace="WebCore"
-namespaceURI="http://www.w3.org/1999/xhtml"
-generateFactory="0"
-generateWrapperFactory="1"
-attrsNullNamespace="1"
-
-abbr
-accept_charset
-accept
-accesskey
-action
-align
-alink
-alt
-archive
-aria-activedescendant
-aria-checked
-aria-describedby
-aria-labeledby
-aria-labelledby
-aria-level
-aria-pressed
-aria-valuemax
-aria-valuemin
-aria-valuenow
-autocomplete
-autofocus
-autoplay
-autosave
-axis
-background
-behavior
-bgcolor
-bgproperties
-border
-bordercolor
-cellpadding
-cellspacing
-char
-challenge
-charoff
-charset
-checked
-cellborder
-cite
-class exportString="1"
-classid
-clear
-code
-codebase
-codetype
-color
-cols
-colspan
-compact
-composite
-content
-contenteditable
-controls
-coords
-data
-datetime
-declare
-defer
-dir
-direction
-disabled
-enctype
-end
-face
-for
-frame
-frameborder
-headers
-height
-hidden
-href
-hreflang
-hspace
-http_equiv
-id
-incremental
-ismap
-keytype
-label
-lang
-language
-left
-leftmargin
-link
-longdesc
-loop
-playcount
-loopend
-loopstart
-lowsrc
-manifest
-marginheight
-marginwidth
-max
-maxlength
-mayscript
-media
-method
-min
-multiple
-name
-nohref
-noresize
-noshade
-nowrap
-object
-onabort
-onbeforecopy
-onbeforecut
-onbeforepaste
-onbeforeunload
-onblur
-onchange
-onclick
-oncontextmenu
-oncopy
-oncut
-ondblclick
-ondrag
-ondragend
-ondragenter
-ondragleave
-ondragover
-ondragstart
-ondrop
-onerror
-onfocus
-oninput
-onkeydown
-onkeypress
-onkeyup
-onload
-onmousedown
-onmousemove
-onmouseout
-onmouseover
-onmouseup
-onmousewheel
-onpaste
-onreset
-onresize
-onscroll
-onsearch
-onselect
-onselectstart
-onstorage
-onsubmit
-onunload
-onwebkitanimationstart
-onwebkitanimationiteration
-onwebkitanimationend
-onwebkittransitionend
-pagex
-pagey
-placeholder
-plain
-pluginpage
-pluginspage
-pluginurl
-poster
-precision
-profile
-prompt
-readonly
-rel
-results
-rev
-role
-rows
-rowspan
-rules
-scheme
-scope
-scrollamount
-scrolldelay
-scrolling
-selected
-shape
-size
-span
-src
-standby
-start
-style
-summary
-tabindex
-tableborder
-target
-text
-title
-top
-topmargin
-truespeed
-type
-usemap
-valign
-value
-valuetype
-version
-viewsource
-vlink
-vspace
-width
-wrap
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index 24f4c77..f9622e7 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -1031,12 +1031,12 @@ 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)"
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --wrapperFactory --extraDefines "$(HTML_FLAGS)"
 
 else
 
 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
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --wrapperFactory
 
 endif
 
@@ -1081,11 +1081,11 @@ endif
 ifdef SVG_FLAGS
 
 SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in
-	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)"
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
 else
 
 SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in
-	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in
+	perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
 
 endif