Merge DOMTokenList and DOMSettableTokenList
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Feb 2016 16:57:44 +0000 (16:57 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Feb 2016 16:57:44 +0000 (16:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=153677
<rdar://problem/24419675>

Reviewed by Sam Weinig.

LayoutTests/imported/w3c:

Rebaseline several W3C tests now that more checks are passing.

* web-platform-tests/dom/historical-expected.txt:
* web-platform-tests/dom/interfaces-expected.txt:
* web-platform-tests/dom/nodes/Element-classlist-expected.txt:
* web-platform-tests/html/dom/interfaces-expected.txt:

* web-platform-tests/html/dom/interfaces.html:
Update HTMLAreaElement.relList to match the specification.

Source/WebCore:

Merge DOMTokenList and DOMSettableTokenList, as per a recent
specification change:
- https://github.com/whatwg/dom/pull/120
- https://github.com/whatwg/html/issues/361

No new tests, already covered by existing tests.

* CMakeLists.txt:
* DerivedSources.cpp:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* dom/Element.idl:
* dom/Node.h:
* dom/NodeRareData.h:
* html/AttributeDOMTokenList.h:
* html/DOMSettableTokenList.cpp: Removed.
* html/DOMSettableTokenList.h:
* html/DOMSettableTokenList.idl:
* html/DOMTokenList.cpp:
(WebCore::DOMTokenList::setValue):
* html/DOMTokenList.h:
* html/DOMTokenList.idl:
* html/HTMLAnchorElement.idl:
* html/HTMLAreaElement.idl:
* html/HTMLElement.cpp:
* html/HTMLElement.idl:
* html/HTMLIFrameElement.cpp:
(WebCore::HTMLIFrameElement::sandbox):
* html/HTMLIFrameElement.h:
* html/HTMLIFrameElement.idl:
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::sizes):
* html/HTMLLinkElement.h:
* html/HTMLLinkElement.idl:
* html/HTMLOutputElement.cpp:
(WebCore::HTMLOutputElement::htmlFor):
* html/HTMLOutputElement.h:
* html/HTMLOutputElement.idl:
* html/HTMLTableCellElement.idl:
* page/DOMWindow.cpp:
* page/DOMWindow.idl:

LayoutTests:

Update / rebaseline several tests now that relList attributes
use [PutForward=value].

* fast/dom/HTMLElement/class-list-expected.txt:
* fast/dom/HTMLElement/class-list-quirks-expected.txt:
* fast/dom/HTMLElement/script-tests/class-list.js:
* fast/dom/rel-list-expected.txt:
* fast/dom/rel-list.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

44 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/dom/HTMLElement/class-list-expected.txt
LayoutTests/fast/dom/HTMLElement/class-list-quirks-expected.txt
LayoutTests/fast/dom/HTMLElement/script-tests/class-list.js
LayoutTests/fast/dom/rel-list-expected.txt
LayoutTests/fast/dom/rel-list.html
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt
LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt
LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Element-classlist-expected.txt
LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt
LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces.html
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.cpp
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/dom/Element.idl
Source/WebCore/dom/Node.h
Source/WebCore/dom/NodeRareData.h
Source/WebCore/html/AttributeDOMTokenList.h
Source/WebCore/html/DOMSettableTokenList.cpp [deleted file]
Source/WebCore/html/DOMSettableTokenList.h
Source/WebCore/html/DOMSettableTokenList.idl
Source/WebCore/html/DOMTokenList.cpp
Source/WebCore/html/DOMTokenList.h
Source/WebCore/html/DOMTokenList.idl
Source/WebCore/html/HTMLAnchorElement.idl
Source/WebCore/html/HTMLAreaElement.idl
Source/WebCore/html/HTMLElement.cpp
Source/WebCore/html/HTMLElement.idl
Source/WebCore/html/HTMLIFrameElement.cpp
Source/WebCore/html/HTMLIFrameElement.h
Source/WebCore/html/HTMLIFrameElement.idl
Source/WebCore/html/HTMLLinkElement.cpp
Source/WebCore/html/HTMLLinkElement.h
Source/WebCore/html/HTMLLinkElement.idl
Source/WebCore/html/HTMLOutputElement.cpp
Source/WebCore/html/HTMLOutputElement.h
Source/WebCore/html/HTMLOutputElement.idl
Source/WebCore/html/HTMLTableCellElement.idl
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DOMWindow.idl

index 9f0991b..cb66401 100644 (file)
@@ -1,3 +1,20 @@
+2016-02-04  Chris Dumez  <cdumez@apple.com>
+
+        Merge DOMTokenList and DOMSettableTokenList
+        https://bugs.webkit.org/show_bug.cgi?id=153677
+        <rdar://problem/24419675>
+
+        Reviewed by Sam Weinig.
+
+        Update / rebaseline several tests now that relList attributes
+        use [PutForward=value].
+
+        * fast/dom/HTMLElement/class-list-expected.txt:
+        * fast/dom/HTMLElement/class-list-quirks-expected.txt:
+        * fast/dom/HTMLElement/script-tests/class-list.js:
+        * fast/dom/rel-list-expected.txt:
+        * fast/dom/rel-list.html:
+
 2016-02-04  Hunseop Jeong  <hs85.jeong@samsung.com>
 
         Unreviewed. EFL gardening after r195740.
index afc4edd..ce92469 100644 (file)
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/
-PASS String(element.classList) is "x"
+PASS String(element.classList) is "y"
 PASS element.classList.length is 0
 PASS element.classList.length is 1
 PASS element.classList.length is 1
index afc4edd..ce92469 100644 (file)
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/
-PASS String(element.classList) is "x"
+PASS String(element.classList) is "y"
 PASS element.classList.length is 0
 PASS element.classList.length is 1
 PASS element.classList.length is 1
index 64e6ac7..656b666 100644 (file)
@@ -11,15 +11,9 @@ function createElement(className)
 debug('Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/');
 
 // http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/setting/001.htm
-// Firefox throws here but WebKit does not throw on setting readonly idl
-// attributes.
 createElement('x');
-try {
-    element.classList = 'y';
-    shouldBeEqualToString('String(element.classList)', 'x');
-} catch (ex) {
-    testPassed('Throwing on set is acceptable');
-}
+element.classList = 'y';
+shouldBeEqualToString('String(element.classList)', 'y');
 
 // http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/getting/001.htm
 createElement('');
index dbe7d60..93c55ea 100644 (file)
@@ -23,7 +23,7 @@ PASS element.relList.length is 2
 PASS element.relList.contains("marshmallow") is true
 PASS element.relList.contains("chips") is true
 PASS element.relList.contains("orange") is false
-PASS String(element.relList) is "x"
+PASS String(element.relList) is "y"
 PASS element.relList.length is 0
 PASS element.relList.length is 1
 PASS element.relList.length is 1
@@ -146,7 +146,7 @@ PASS element.relList.length is 2
 PASS element.relList.contains("marshmallow") is true
 PASS element.relList.contains("chips") is true
 PASS element.relList.contains("orange") is false
-PASS String(element.relList) is "x"
+PASS String(element.relList) is "y"
 PASS element.relList.length is 0
 PASS element.relList.length is 1
 PASS element.relList.length is 1
@@ -269,7 +269,7 @@ PASS element.relList.length is 2
 PASS element.relList.contains("marshmallow") is true
 PASS element.relList.contains("chips") is true
 PASS element.relList.contains("orange") is false
-PASS String(element.relList) is "x"
+PASS String(element.relList) is "y"
 PASS element.relList.length is 0
 PASS element.relList.length is 1
 PASS element.relList.length is 1
index 597dfed..c390add 100644 (file)
@@ -53,7 +53,7 @@ function test()
 
     createElement('x');
     element.relList = 'y';
-    shouldBeEqualToString('String(element.relList)', 'x');
+    shouldBeEqualToString('String(element.relList)', 'y');
 
     createElement('');
     shouldEvaluateTo('element.relList.length', 0);
index 7dcc3ab..8553560 100644 (file)
@@ -1,3 +1,21 @@
+2016-02-04  Chris Dumez  <cdumez@apple.com>
+
+        Merge DOMTokenList and DOMSettableTokenList
+        https://bugs.webkit.org/show_bug.cgi?id=153677
+        <rdar://problem/24419675>
+
+        Reviewed by Sam Weinig.
+
+        Rebaseline several W3C tests now that more checks are passing.
+
+        * web-platform-tests/dom/historical-expected.txt:
+        * web-platform-tests/dom/interfaces-expected.txt:
+        * web-platform-tests/dom/nodes/Element-classlist-expected.txt:
+        * web-platform-tests/html/dom/interfaces-expected.txt:
+
+        * web-platform-tests/html/dom/interfaces.html:
+        Update HTMLAreaElement.relList to match the specification.
+
 2016-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         [Fetch API] Add support for iterating over Headers
index f135cce..c6ec80c 100644 (file)
@@ -7,7 +7,7 @@ PASS Historical DOM features must be removed: DOMImplementationList
 PASS Historical DOM features must be removed: DOMImplementationSource 
 PASS Historical DOM features must be removed: DOMLocator 
 PASS Historical DOM features must be removed: DOMObject 
-FAIL Historical DOM features must be removed: DOMSettableTokenList assert_equals: expected (undefined) undefined but got (object) object "[object DOMSettableTokenListConstructor]"
+FAIL Historical DOM features must be removed: DOMSettableTokenList assert_equals: expected (undefined) undefined but got (object) object "[object DOMTokenListConstructor]"
 PASS Historical DOM features must be removed: DOMUserData 
 PASS Historical DOM features must be removed: Entity 
 PASS Historical DOM features must be removed: EntityReference 
index 1097650..c3cc7e6 100644 (file)
@@ -707,7 +707,7 @@ FAIL Element interface: attribute localName assert_own_property: expected proper
 PASS Element interface: attribute tagName 
 PASS Element interface: attribute id 
 PASS Element interface: attribute className 
-FAIL Element interface: attribute classList assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
+PASS Element interface: attribute classList 
 PASS Element interface: operation hasAttributes() 
 PASS Element interface: attribute attributes 
 FAIL Element interface: operation getAttribute(DOMString) assert_equals: property has wrong .length expected 1 but got 0
@@ -1559,7 +1559,7 @@ PASS DOMTokenList interface: operation remove(DOMString)
 PASS DOMTokenList interface: operation toggle(DOMString,boolean) 
 FAIL DOMTokenList interface: operation replace(DOMString,DOMString) assert_own_property: interface prototype object missing non-static operation expected property "replace" missing
 FAIL DOMTokenList interface: operation supports(DOMString) assert_own_property: interface prototype object missing non-static operation expected property "supports" missing
-FAIL DOMTokenList interface: attribute value assert_true: The prototype object must have a property "value" expected true got false
+PASS DOMTokenList interface: attribute value 
 FAIL DOMTokenList interface: stringifier assert_true: property is not enumerable expected true got false
 PASS DOMTokenList must be primary interface of document.body.classList 
 PASS Stringification of document.body.classList 
@@ -1578,5 +1578,5 @@ FAIL DOMTokenList interface: document.body.classList must inherit property "repl
 FAIL DOMTokenList interface: calling replace(DOMString,DOMString) on document.body.classList with too few arguments must throw TypeError assert_inherits: property "replace" not found in prototype chain
 FAIL DOMTokenList interface: document.body.classList must inherit property "supports" with the proper type (7) assert_inherits: property "supports" not found in prototype chain
 FAIL DOMTokenList interface: calling supports(DOMString) on document.body.classList with too few arguments must throw TypeError assert_inherits: property "supports" not found in prototype chain
-FAIL DOMTokenList interface: document.body.classList must inherit property "value" with the proper type (8) assert_inherits: property "value" not found in prototype chain
+PASS DOMTokenList interface: document.body.classList must inherit property "value" with the proper type (8) 
 
index 048099b..d83ed16 100644 (file)
@@ -62,5 +62,5 @@ PASS classList.add should treat \r as a space
 PASS classList.add should treat \n as a space 
 PASS classList.add should treat \f as a space 
 PASS classList.length must be read-only 
-FAIL classList must have [PutForwards=value] assert_equals: expected 2 but got 1
+PASS classList must have [PutForwards=value] 
 
index 0e6b789..fc8d3c7 100644 (file)
@@ -1371,7 +1371,7 @@ PASS HTMLLinkElement interface: existence and properties of interface prototype
 PASS HTMLLinkElement interface: attribute href 
 FAIL HTMLLinkElement interface: attribute crossOrigin assert_true: The prototype object must have a property "crossOrigin" expected true got false
 PASS HTMLLinkElement interface: attribute rel 
-FAIL HTMLLinkElement interface: attribute relList assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
+PASS HTMLLinkElement interface: attribute relList 
 PASS HTMLLinkElement interface: attribute media 
 PASS HTMLLinkElement interface: attribute hreflang 
 PASS HTMLLinkElement interface: attribute type 
@@ -1598,7 +1598,7 @@ PASS HTMLAnchorElement interface: attribute target
 FAIL HTMLAnchorElement interface: attribute download assert_true: The prototype object must have a property "download" expected true got false
 PASS HTMLAnchorElement interface: attribute ping 
 PASS HTMLAnchorElement interface: attribute rel 
-FAIL HTMLAnchorElement interface: attribute relList assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
+PASS HTMLAnchorElement interface: attribute relList 
 PASS HTMLAnchorElement interface: attribute hreflang 
 PASS HTMLAnchorElement interface: attribute type 
 PASS HTMLAnchorElement interface: attribute text 
index 01adb7e..9b802e1 100644 (file)
@@ -1502,7 +1502,7 @@ interface HTMLAreaElement : HTMLElement {
   attribute DOMString download;
   [PutForwards=value] readonly attribute DOMTokenList ping;
   attribute DOMString rel;
-  readonly attribute DOMTokenList relList;
+  [PutForwards=value] readonly attribute DOMTokenList relList;
   // hreflang and type are not reflected
 };
 HTMLAreaElement implements HTMLHyperlinkElementUtils;
index 28ff5bc..ce6b4bc 100644 (file)
@@ -1636,7 +1636,6 @@ set(WebCore_SOURCES
     html/CheckboxInputType.cpp
     html/ColorInputType.cpp
     html/DOMFormData.cpp
-    html/DOMSettableTokenList.cpp
     html/DOMTokenList.cpp
     html/DOMURL.cpp
     html/DateInputType.cpp
index 1555f78..5476932 100644 (file)
@@ -1,3 +1,54 @@
+2016-02-04  Chris Dumez  <cdumez@apple.com>
+
+        Merge DOMTokenList and DOMSettableTokenList
+        https://bugs.webkit.org/show_bug.cgi?id=153677
+        <rdar://problem/24419675>
+
+        Reviewed by Sam Weinig.
+
+        Merge DOMTokenList and DOMSettableTokenList, as per a recent
+        specification change:
+        - https://github.com/whatwg/dom/pull/120
+        - https://github.com/whatwg/html/issues/361
+
+        No new tests, already covered by existing tests.
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/Element.idl:
+        * dom/Node.h:
+        * dom/NodeRareData.h:
+        * html/AttributeDOMTokenList.h:
+        * html/DOMSettableTokenList.cpp: Removed.
+        * html/DOMSettableTokenList.h:
+        * html/DOMSettableTokenList.idl:
+        * html/DOMTokenList.cpp:
+        (WebCore::DOMTokenList::setValue):
+        * html/DOMTokenList.h:
+        * html/DOMTokenList.idl:
+        * html/HTMLAnchorElement.idl:
+        * html/HTMLAreaElement.idl:
+        * html/HTMLElement.cpp:
+        * html/HTMLElement.idl:
+        * html/HTMLIFrameElement.cpp:
+        (WebCore::HTMLIFrameElement::sandbox):
+        * html/HTMLIFrameElement.h:
+        * html/HTMLIFrameElement.idl:
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::sizes):
+        * html/HTMLLinkElement.h:
+        * html/HTMLLinkElement.idl:
+        * html/HTMLOutputElement.cpp:
+        (WebCore::HTMLOutputElement::htmlFor):
+        * html/HTMLOutputElement.h:
+        * html/HTMLOutputElement.idl:
+        * html/HTMLTableCellElement.idl:
+        * page/DOMWindow.cpp:
+        * page/DOMWindow.idl:
+
 2016-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         Unreviewed.
index 6432fa3..734c89d 100644 (file)
 #include "JSDOMPluginArray.cpp"
 #include "JSDOMSecurityPolicy.cpp"
 #include "JSDOMSelection.cpp"
-#include "JSDOMSettableTokenList.cpp"
 #include "JSDOMStringList.cpp"
 #include "JSDOMStringMap.cpp"
 #include "JSDOMTokenList.cpp"
index 589dd93..c5b47ec 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringList.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     <ClCompile Include="..\html\DateTimeInputType.cpp" />
     <ClCompile Include="..\html\DateTimeLocalInputType.cpp" />
     <ClCompile Include="..\html\DOMFormData.cpp" />
-    <ClCompile Include="..\html\DOMSettableTokenList.cpp" />
     <ClCompile Include="..\html\DOMTokenList.cpp" />
     <ClCompile Include="..\html\DOMURL.cpp" />
     <ClCompile Include="..\html\MediaElementSession.cpp" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMPlugin.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMPluginArray.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSelection.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringList.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringMap.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMTokenList.h" />
     <ClInclude Include="..\html\DateTimeInputType.h" />
     <ClInclude Include="..\html\DateTimeLocalInputType.h" />
     <ClInclude Include="..\html\DOMFormData.h" />
-    <ClInclude Include="..\html\DOMSettableTokenList.h" />
     <ClInclude Include="..\html\DOMTokenList.h" />
     <ClInclude Include="..\html\DOMURL.h" />
     <ClInclude Include="..\html\EmailInputType.h" />
index 591fee8..c0e0869 100644 (file)
     <ClCompile Include="..\html\DOMFormData.cpp">
       <Filter>html</Filter>
     </ClCompile>
-    <ClCompile Include="..\html\DOMSettableTokenList.cpp">
-      <Filter>html</Filter>
-    </ClCompile>
     <ClCompile Include="..\html\DOMTokenList.cpp">
       <Filter>html</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSelection.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringList.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClInclude Include="..\html\DOMFormData.h">
       <Filter>html</Filter>
     </ClInclude>
-    <ClInclude Include="..\html\DOMSettableTokenList.h">
-      <Filter>html</Filter>
-    </ClInclude>
     <ClInclude Include="..\html\DOMTokenList.h">
       <Filter>html</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSelection.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringList.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
index b4c0dfb..d46fcac 100644 (file)
                4A9CC81816BB9AC600EC645A /* CSSDefaultStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */; };
                4A9CC82016BF9BB400EC645A /* InspectorCSSOMWrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */; };
                4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */; };
-               4ACBC0C312713CCA0094F9B2 /* DOMSettableTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0C012713CCA0094F9B2 /* DOMSettableTokenList.cpp */; };
                4ACBC0C412713CCA0094F9B2 /* DOMSettableTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */; };
-               4ACBC0CA12713D0A0094F9B2 /* JSDOMSettableTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0C812713D0A0094F9B2 /* JSDOMSettableTokenList.cpp */; };
-               4ACBC0CB12713D0A0094F9B2 /* JSDOMSettableTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0C912713D0A0094F9B2 /* JSDOMSettableTokenList.h */; };
                4AD01008127E642A0015035F /* HTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD01005127E642A0015035F /* HTMLOutputElement.cpp */; };
                4AD01009127E642A0015035F /* HTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD01006127E642A0015035F /* HTMLOutputElement.h */; };
                4AD0173C127E82860015035F /* JSHTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD0173A127E82860015035F /* JSHTMLOutputElement.cpp */; };
                4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSDefaultStyleSheets.h; sourceTree = "<group>"; };
                4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCSSOMWrappers.cpp; sourceTree = "<group>"; };
                4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCSSOMWrappers.h; sourceTree = "<group>"; };
-               4ACBC0C012713CCA0094F9B2 /* DOMSettableTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSettableTokenList.cpp; sourceTree = "<group>"; };
                4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSettableTokenList.h; sourceTree = "<group>"; };
                4ACBC0C212713CCA0094F9B2 /* DOMSettableTokenList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMSettableTokenList.idl; sourceTree = "<group>"; };
-               4ACBC0C812713D0A0094F9B2 /* JSDOMSettableTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMSettableTokenList.cpp; sourceTree = "<group>"; };
-               4ACBC0C912713D0A0094F9B2 /* JSDOMSettableTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMSettableTokenList.h; sourceTree = "<group>"; };
                4AD01005127E642A0015035F /* HTMLOutputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOutputElement.cpp; sourceTree = "<group>"; };
                4AD01006127E642A0015035F /* HTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLOutputElement.h; sourceTree = "<group>"; };
                4AD01007127E642A0015035F /* HTMLOutputElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLOutputElement.idl; sourceTree = "<group>"; };
                                2ED609BA1145B07100C8684E /* DOMFormData.cpp */,
                                2ED609BB1145B07100C8684E /* DOMFormData.h */,
                                2E0888C3114883A900AF4265 /* DOMFormData.idl */,
-                               4ACBC0C012713CCA0094F9B2 /* DOMSettableTokenList.cpp */,
                                4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */,
                                4ACBC0C212713CCA0094F9B2 /* DOMSettableTokenList.idl */,
                                76FC2B0812370DA0006A991A /* DOMTokenList.cpp */,
                                2E0888D31148848A00AF4265 /* JSDOMFormData.h */,
                                FB91392916AE4FC0001FE682 /* JSDOMPath.cpp */,
                                FB91392816AE4FC0001FE682 /* JSDOMPath.h */,
-                               4ACBC0C812713D0A0094F9B2 /* JSDOMSettableTokenList.cpp */,
-                               4ACBC0C912713D0A0094F9B2 /* JSDOMSettableTokenList.h */,
                                7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */,
                                7694563B1214D97C0007CBAE /* JSDOMTokenList.h */,
                                2E37E00312DBC5A400A6B233 /* JSDOMURL.cpp */,
                                A9D248010D757E6900FDF959 /* JSDOMPluginArray.h in Headers */,
                                E172AF901811BC3700FBADB9 /* JSDOMPromise.h in Headers */,
                                BC5A86B60C3367E800EEA649 /* JSDOMSelection.h in Headers */,
-                               4ACBC0CB12713D0A0094F9B2 /* JSDOMSettableTokenList.h in Headers */,
                                C5137CF311A58378004ADB99 /* JSDOMStringList.h in Headers */,
                                BC64649811D82349006455B0 /* JSDOMStringMap.h in Headers */,
                                7694563D1214D97C0007CBAE /* JSDOMTokenList.h in Headers */,
                                BCAEFCAE1016CE4A0040D34E /* DOMRGBColor.mm in Sources */,
                                2D9A246F15B9BD2F00D34527 /* DOMSecurityPolicy.cpp in Sources */,
                                BC5A86840C33676000EEA649 /* DOMSelection.cpp in Sources */,
-                               4ACBC0C312713CCA0094F9B2 /* DOMSettableTokenList.cpp in Sources */,
                                C55610F111A704EB00B82D27 /* DOMStringList.cpp in Sources */,
                                0FF5025C102BA9010066F39A /* DOMStyleMedia.mm in Sources */,
                                850657010AAB4763002D15C0 /* DOMStyleSheet.mm in Sources */,
                                A9C6E64D0D7465E7006442E9 /* JSDOMPluginCustom.cpp in Sources */,
                                E172AF8F1811BC3700FBADB9 /* JSDOMPromise.cpp in Sources */,
                                BC5A86B50C3367E800EEA649 /* JSDOMSelection.cpp in Sources */,
-                               4ACBC0CA12713D0A0094F9B2 /* JSDOMSettableTokenList.cpp in Sources */,
                                C5137CF211A58378004ADB99 /* JSDOMStringList.cpp in Sources */,
                                9A1B6F97158869C80011A8C4 /* JSDOMStringListCustom.cpp in Sources */,
                                BC64649711D82349006455B0 /* JSDOMStringMap.cpp in Sources */,
index b987aa0..a63f0a0 100644 (file)
              
 
     [Reflect=class] attribute DOMString className;
-    readonly attribute DOMTokenList classList;
+    [PutForwards=value] readonly attribute DOMTokenList classList;
 
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
     readonly attribute DOMStringMap dataset;
index a9a716d..f660dd1 100644 (file)
@@ -45,7 +45,7 @@ namespace WebCore {
 class Attribute;
 class ClassCollection;
 class ContainerNode;
-class DOMSettableTokenList;
+class DOMTokenList;
 class Document;
 class Element;
 class Event;
index cb98c33..6ec51b3 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "ChildNodeList.h"
 #include "ClassCollection.h"
-#include "DOMSettableTokenList.h"
+#include "DOMTokenList.h"
 #include "HTMLCollection.h"
 #include "HTMLNames.h"
 #include "LiveNodeList.h"
index f653bfe..6fd8c00 100644 (file)
 #ifndef AttributeDOMTokenList_h
 #define AttributeDOMTokenList_h
 
-#include "DOMSettableTokenList.h"
+#include "DOMTokenList.h"
 #include "Element.h"
 
 namespace WebCore {
 
-class AttributeDOMTokenList final : public DOMSettableTokenList {
+class AttributeDOMTokenList final : public DOMTokenList {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     AttributeDOMTokenList(Element&, const QualifiedName& attributeName);
diff --git a/Source/WebCore/html/DOMSettableTokenList.cpp b/Source/WebCore/html/DOMSettableTokenList.cpp
deleted file mode 100644 (file)
index 3eac154..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DOMSettableTokenList.h"
-
-namespace WebCore {
-
-void DOMSettableTokenList::setValue(const String& value)
-{
-    setValueInternal(value);
-    updateAfterTokenChange();
-}
-
-} // namespace WebCore
index 056a89a..a3dbca8 100644 (file)
 
 namespace WebCore {
 
-typedef int ExceptionCode;
-
+// Only used by ObjC and GObject bindings.
 class DOMSettableTokenList : public DOMTokenList {
     WTF_MAKE_FAST_ALLOCATED;
-public:
-    void setValue(const String&);
-
-    // Make public.
-    using DOMTokenList::value;
 };
 
 } // namespace WebCore
index 59d0be2..25b5b7f 100644 (file)
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
+
 [
+    NoInterfaceObject,
     JSGenerateToJSObject,
     SkipVTableValidation,
 ] interface DOMSettableTokenList : DOMTokenList {
@@ -31,3 +34,4 @@
     [TreatReturnedNullStringAs=Null] getter DOMString (unsigned long index);
 };
 
+#endif
index acb4567..474702a 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -158,6 +158,12 @@ const AtomicString& DOMTokenList::value() const
     return m_cachedValue;
 }
 
+void DOMTokenList::setValue(const String& value)
+{
+    setValueInternal(value);
+    updateAfterTokenChange();
+}
+
 void DOMTokenList::setValueInternal(const WTF::String& value)
 {
     // Clear tokens but not capacity.
index a27d47b..3d4455d 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -58,9 +58,11 @@ public:
 
     virtual Element* element() const { return nullptr; }
 
+    void setValue(const String&);
+    const AtomicString& value() const;
+
 protected:
     DOMTokenList() = default;
-    const AtomicString& value() const;
     void setValueInternal(const String&);
 
     virtual void updateAfterTokenChange() { m_cachedValue = nullAtom; }
index 322718b..04558d7 100644 (file)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
+ * Copyright (C) 2016, Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,6 +34,8 @@
     [RaisesException] void remove(DOMString... tokens);
     [RaisesException, Custom] boolean toggle(DOMString token, optional boolean force);
 
+    attribute DOMString value;
+
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
     [NotEnumerable] DOMString toString();
 #endif
index 0732d7b..4e2cdda 100644 (file)
@@ -27,7 +27,7 @@ interface HTMLAnchorElement : HTMLElement {
     [Reflect] attribute DOMString name;
 
     // FIXME: This is supposed to be:
-    // [PutForwards=value] readonly attribute DOMSettableTokenList ping;
+    // [PutForwards=value] readonly attribute DOMTokenList ping;
     [Reflect] attribute DOMString ping;
 
     [Reflect] attribute DOMString rel;
@@ -70,6 +70,6 @@ interface HTMLAnchorElement : HTMLElement {
     readonly attribute URL absoluteLinkURL;
 #endif
 
-    readonly attribute DOMTokenList relList;
+    [PutForwards=value] readonly attribute DOMTokenList relList;
 };
 
index 955fed8..04deacd 100644 (file)
@@ -25,7 +25,7 @@ interface HTMLAreaElement : HTMLElement {
     [Reflect] attribute boolean noHref;
 
     // FIXME: This is supposed to be:
-    // [PutForwards=value] readonly attribute DOMSettableTokenList ping;
+    // [PutForwards=value] readonly attribute DOMTokenList ping;
     [Reflect] attribute DOMString ping;
 
     [Reflect] attribute DOMString rel;
@@ -49,6 +49,6 @@ interface HTMLAreaElement : HTMLElement {
     readonly attribute URL absoluteLinkURL;
 #endif
 
-    readonly attribute DOMTokenList relList;
+    [PutForwards=value] readonly attribute DOMTokenList relList;
 };
 
index 4ad5f9c..ce35a0f 100644 (file)
@@ -29,7 +29,7 @@
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
 #include "CSSValuePool.h"
-#include "DOMSettableTokenList.h"
+#include "DOMTokenList.h"
 #include "DocumentFragment.h"
 #include "ElementAncestorIterator.h"
 #include "Event.h"
index d914bf6..0679f24 100644 (file)
@@ -39,7 +39,7 @@
 
              [Reflect] attribute DOMString webkitdropzone;
              // FIXME: Support the standard HTML equivalent.
-             // [PutForwards=value] readonly attribute DOMSettableTokenList dropzone;
+             // [PutForwards=value] readonly attribute DOMTokenList dropzone;
 
              [Reflect] attribute boolean hidden;
              [Reflect] attribute DOMString accessKey;
index fb78eaa..ac318fc 100644 (file)
@@ -48,7 +48,7 @@ Ref<HTMLIFrameElement> HTMLIFrameElement::create(const QualifiedName& tagName, D
     return adoptRef(*new HTMLIFrameElement(tagName, document));
 }
 
-DOMSettableTokenList& HTMLIFrameElement::sandbox()
+DOMTokenList& HTMLIFrameElement::sandbox()
 {
     if (!m_sandbox)
         m_sandbox = std::make_unique<AttributeDOMTokenList>(*this, sandboxAttr);
index 5b00568..9d07bd9 100644 (file)
@@ -34,7 +34,7 @@ class HTMLIFrameElement final : public HTMLFrameElementBase {
 public:
     static Ref<HTMLIFrameElement> create(const QualifiedName&, Document&);
 
-    DOMSettableTokenList& sandbox();
+    DOMTokenList& sandbox();
 
 private:
     HTMLIFrameElement(const QualifiedName&, Document&);
index 7fe7820..4b6c43c 100644 (file)
@@ -30,7 +30,7 @@ interface HTMLIFrameElement : HTMLElement {
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     [Reflect] attribute DOMString sandbox;
 #else
-    [PutForwards=value] readonly attribute DOMSettableTokenList sandbox;
+    [PutForwards=value] readonly attribute DOMTokenList sandbox;
 #endif
 
     [Reflect] attribute DOMString scrolling;
index 18ee435..49c15ce 100644 (file)
@@ -367,7 +367,7 @@ bool HTMLLinkElement::styleSheetIsLoading() const
     return m_sheet->contents().isLoading();
 }
 
-DOMSettableTokenList& HTMLLinkElement::sizes()
+DOMTokenList& HTMLLinkElement::sizes()
 {
     if (!m_sizes)
         m_sizes = std::make_unique<AttributeDOMTokenList>(*this, sizesAttr);
index 3fa8164..279335e 100644 (file)
@@ -65,7 +65,7 @@ public:
 
     bool isDisabled() const { return m_disabledState == Disabled; }
     bool isEnabledViaScript() const { return m_disabledState == EnabledViaScript; }
-    DOMSettableTokenList& sizes();
+    DOMTokenList& sizes();
 
     void dispatchPendingEvent(LinkEventSender*);
     static void dispatchPendingLoadEvents();
index bd925c3..ed4b128 100644 (file)
@@ -28,7 +28,7 @@ interface HTMLLinkElement : HTMLElement {
     [Reflect] attribute DOMString rel;
     [Reflect] attribute DOMString rev;
 #if (defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT) || (defined(LANGUAGE_GOBJECT) || LANGUAGE_GOBJECT)
-    [PutForwards=value] readonly attribute DOMSettableTokenList sizes;
+    [PutForwards=value] readonly attribute DOMTokenList sizes;
 #endif
     [Reflect] attribute DOMString target;
     [Reflect] attribute DOMString type;
@@ -41,6 +41,6 @@ interface HTMLLinkElement : HTMLElement {
     readonly attribute URL absoluteLinkURL;
 #endif
 
-    readonly attribute DOMTokenList relList;
+    [PutForwards=value] readonly attribute DOMTokenList relList;
 };
 
index edda4fd..5c02c5e 100644 (file)
@@ -127,7 +127,7 @@ void HTMLOutputElement::setDefaultValue(const String& value)
         setTextContentInternal(value);
 }
 
-DOMSettableTokenList& HTMLOutputElement::htmlFor()
+DOMTokenList& HTMLOutputElement::htmlFor()
 {
     if (!m_tokens)
         m_tokens = std::make_unique<AttributeDOMTokenList>(*this, forAttr);
index 4922566..b4ed549 100644 (file)
@@ -44,7 +44,7 @@ public:
     void setValue(const String&);
     String defaultValue() const;
     void setDefaultValue(const String&);
-    DOMSettableTokenList& htmlFor();
+    DOMTokenList& htmlFor();
     
     virtual bool canContainRangeEndPoint() const override { return false; }
 
index bdcb0bd..cd5b2f5 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 interface HTMLOutputElement : HTMLElement {
-    [PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
+    [PutForwards=value] readonly attribute DOMTokenList htmlFor;
 
     readonly attribute HTMLFormElement form;
     [Reflect] attribute DOMString name;
index b76ba25..a7097a7 100644 (file)
@@ -28,7 +28,7 @@ interface HTMLTableCellElement : HTMLElement {
     attribute long colSpan;
 
     // FIXME: This is supposed to be:
-    // [PutForwards=value] readonly attribute DOMSettableTokenList headers;
+    // [PutForwards=value] readonly attribute DOMTokenList headers;
     [Reflect] attribute DOMString headers;
 
     [Reflect] attribute DOMString height;
index dac54d7..a8b853c 100644 (file)
@@ -40,7 +40,6 @@
 #include "Crypto.h"
 #include "DOMApplicationCache.h"
 #include "DOMSelection.h"
-#include "DOMSettableTokenList.h"
 #include "DOMStringList.h"
 #include "DOMTimer.h"
 #include "DOMTokenList.h"
index 6332101..5a4affb 100644 (file)
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
     // Additional constructors.
     [CustomGetter, CustomConstructor] attribute HTMLImageElementNamedConstructor Image; // Usable with new operator
+    attribute DOMTokenListConstructor DOMSettableTokenList; // Map DOMSettableTokenList to DOMTokenList for backward compatibility.
 
     [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchConstructor Touch; // Usable with the new operator
     [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchListConstructor TouchList; // Usable with the new operator