Changeset 196123 in webkit


Ignore:
Timestamp:
Feb 4, 2016 8:57:44 AM (8 years ago)
Author:
Chris Dumez
Message:

Merge DOMTokenList and DOMSettableTokenList
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:

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:
Location:
trunk
Files:
1 deleted
43 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r196114 r196123  
     12016-02-04  Chris Dumez  <cdumez@apple.com>
     2
     3        Merge DOMTokenList and DOMSettableTokenList
     4        https://bugs.webkit.org/show_bug.cgi?id=153677
     5        <rdar://problem/24419675>
     6
     7        Reviewed by Sam Weinig.
     8
     9        Update / rebaseline several tests now that relList attributes
     10        use [PutForward=value].
     11
     12        * fast/dom/HTMLElement/class-list-expected.txt:
     13        * fast/dom/HTMLElement/class-list-quirks-expected.txt:
     14        * fast/dom/HTMLElement/script-tests/class-list.js:
     15        * fast/dom/rel-list-expected.txt:
     16        * fast/dom/rel-list.html:
     17
    1182016-02-04  Hunseop Jeong  <hs85.jeong@samsung.com>
    219
  • trunk/LayoutTests/fast/dom/HTMLElement/class-list-expected.txt

    r190078 r196123  
    55
    66Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/
    7 PASS String(element.classList) is "x"
     7PASS String(element.classList) is "y"
    88PASS element.classList.length is 0
    99PASS element.classList.length is 1
  • trunk/LayoutTests/fast/dom/HTMLElement/class-list-quirks-expected.txt

    r190078 r196123  
    55
    66Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/
    7 PASS String(element.classList) is "x"
     7PASS String(element.classList) is "y"
    88PASS element.classList.length is 0
    99PASS element.classList.length is 1
  • trunk/LayoutTests/fast/dom/HTMLElement/script-tests/class-list.js

    r190078 r196123  
    1212
    1313// http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/setting/001.htm
    14 // Firefox throws here but WebKit does not throw on setting readonly idl
    15 // attributes.
    16 createElement('x');
    17 try {
    18     element.classList = 'y';
    19     shouldBeEqualToString('String(element.classList)', 'x');
    20 } catch (ex) {
    21     testPassed('Throwing on set is acceptable');
    22 }
     14createElement('x');
     15element.classList = 'y';
     16shouldBeEqualToString('String(element.classList)', 'y');
    2317
    2418// http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/getting/001.htm
  • trunk/LayoutTests/fast/dom/rel-list-expected.txt

    r190078 r196123  
    2424PASS element.relList.contains("chips") is true
    2525PASS element.relList.contains("orange") is false
    26 PASS String(element.relList) is "x"
     26PASS String(element.relList) is "y"
    2727PASS element.relList.length is 0
    2828PASS element.relList.length is 1
     
    147147PASS element.relList.contains("chips") is true
    148148PASS element.relList.contains("orange") is false
    149 PASS String(element.relList) is "x"
     149PASS String(element.relList) is "y"
    150150PASS element.relList.length is 0
    151151PASS element.relList.length is 1
     
    270270PASS element.relList.contains("chips") is true
    271271PASS element.relList.contains("orange") is false
    272 PASS String(element.relList) is "x"
     272PASS String(element.relList) is "y"
    273273PASS element.relList.length is 0
    274274PASS element.relList.length is 1
  • trunk/LayoutTests/fast/dom/rel-list.html

    r190078 r196123  
    5454    createElement('x');
    5555    element.relList = 'y';
    56     shouldBeEqualToString('String(element.relList)', 'x');
     56    shouldBeEqualToString('String(element.relList)', 'y');
    5757
    5858    createElement('');
  • trunk/LayoutTests/imported/w3c/ChangeLog

    r196115 r196123  
     12016-02-04  Chris Dumez  <cdumez@apple.com>
     2
     3        Merge DOMTokenList and DOMSettableTokenList
     4        https://bugs.webkit.org/show_bug.cgi?id=153677
     5        <rdar://problem/24419675>
     6
     7        Reviewed by Sam Weinig.
     8
     9        Rebaseline several W3C tests now that more checks are passing.
     10
     11        * web-platform-tests/dom/historical-expected.txt:
     12        * web-platform-tests/dom/interfaces-expected.txt:
     13        * web-platform-tests/dom/nodes/Element-classlist-expected.txt:
     14        * web-platform-tests/html/dom/interfaces-expected.txt:
     15
     16        * web-platform-tests/html/dom/interfaces.html:
     17        Update HTMLAreaElement.relList to match the specification.
     18
    1192016-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    220
  • trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt

    r196079 r196123  
    88PASS Historical DOM features must be removed: DOMLocator
    99PASS Historical DOM features must be removed: DOMObject
    10 FAIL Historical DOM features must be removed: DOMSettableTokenList assert_equals: expected (undefined) undefined but got (object) object "[object DOMSettableTokenListConstructor]"
     10FAIL Historical DOM features must be removed: DOMSettableTokenList assert_equals: expected (undefined) undefined but got (object) object "[object DOMTokenListConstructor]"
    1111PASS Historical DOM features must be removed: DOMUserData
    1212PASS Historical DOM features must be removed: Entity
  • trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt

    r196079 r196123  
    708708PASS Element interface: attribute id
    709709PASS Element interface: attribute className
    710 FAIL Element interface: attribute classList assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
     710PASS Element interface: attribute classList
    711711PASS Element interface: operation hasAttributes()
    712712PASS Element interface: attribute attributes
     
    15601560FAIL DOMTokenList interface: operation replace(DOMString,DOMString) assert_own_property: interface prototype object missing non-static operation expected property "replace" missing
    15611561FAIL DOMTokenList interface: operation supports(DOMString) assert_own_property: interface prototype object missing non-static operation expected property "supports" missing
    1562 FAIL DOMTokenList interface: attribute value assert_true: The prototype object must have a property "value" expected true got false
     1562PASS DOMTokenList interface: attribute value
    15631563FAIL DOMTokenList interface: stringifier assert_true: property is not enumerable expected true got false
    15641564PASS DOMTokenList must be primary interface of document.body.classList
     
    15791579FAIL DOMTokenList interface: document.body.classList must inherit property "supports" with the proper type (7) assert_inherits: property "supports" not found in prototype chain
    15801580FAIL 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
    1581 FAIL DOMTokenList interface: document.body.classList must inherit property "value" with the proper type (8) assert_inherits: property "value" not found in prototype chain
     1581PASS DOMTokenList interface: document.body.classList must inherit property "value" with the proper type (8)
    15821582
  • trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Element-classlist-expected.txt

    r196079 r196123  
    6363PASS classList.add should treat \f as a space
    6464PASS classList.length must be read-only
    65 FAIL classList must have [PutForwards=value] assert_equals: expected 2 but got 1
     65PASS classList must have [PutForwards=value]
    6666
  • trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt

    r196091 r196123  
    13721372FAIL HTMLLinkElement interface: attribute crossOrigin assert_true: The prototype object must have a property "crossOrigin" expected true got false
    13731373PASS HTMLLinkElement interface: attribute rel
    1374 FAIL HTMLLinkElement interface: attribute relList assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
     1374PASS HTMLLinkElement interface: attribute relList
    13751375PASS HTMLLinkElement interface: attribute media
    13761376PASS HTMLLinkElement interface: attribute hreflang
     
    15991599PASS HTMLAnchorElement interface: attribute ping
    16001600PASS HTMLAnchorElement interface: attribute rel
    1601 FAIL HTMLAnchorElement interface: attribute relList assert_equals: setter must be function for PutForwards, Replaceable, or non-readonly attributes expected "function" but got "undefined"
     1601PASS HTMLAnchorElement interface: attribute relList
    16021602PASS HTMLAnchorElement interface: attribute hreflang
    16031603PASS HTMLAnchorElement interface: attribute type
  • trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces.html

    r196091 r196123  
    15031503  [PutForwards=value] readonly attribute DOMTokenList ping;
    15041504  attribute DOMString rel;
    1505   readonly attribute DOMTokenList relList;
     1505  [PutForwards=value] readonly attribute DOMTokenList relList;
    15061506  // hreflang and type are not reflected
    15071507};
  • trunk/Source/WebCore/CMakeLists.txt

    r196118 r196123  
    16371637    html/ColorInputType.cpp
    16381638    html/DOMFormData.cpp
    1639     html/DOMSettableTokenList.cpp
    16401639    html/DOMTokenList.cpp
    16411640    html/DOMURL.cpp
  • trunk/Source/WebCore/ChangeLog

    r196118 r196123  
     12016-02-04  Chris Dumez  <cdumez@apple.com>
     2
     3        Merge DOMTokenList and DOMSettableTokenList
     4        https://bugs.webkit.org/show_bug.cgi?id=153677
     5        <rdar://problem/24419675>
     6
     7        Reviewed by Sam Weinig.
     8
     9        Merge DOMTokenList and DOMSettableTokenList, as per a recent
     10        specification change:
     11        - https://github.com/whatwg/dom/pull/120
     12        - https://github.com/whatwg/html/issues/361
     13
     14        No new tests, already covered by existing tests.
     15
     16        * CMakeLists.txt:
     17        * DerivedSources.cpp:
     18        * WebCore.vcxproj/WebCore.vcxproj:
     19        * WebCore.vcxproj/WebCore.vcxproj.filters:
     20        * WebCore.xcodeproj/project.pbxproj:
     21        * dom/Element.idl:
     22        * dom/Node.h:
     23        * dom/NodeRareData.h:
     24        * html/AttributeDOMTokenList.h:
     25        * html/DOMSettableTokenList.cpp: Removed.
     26        * html/DOMSettableTokenList.h:
     27        * html/DOMSettableTokenList.idl:
     28        * html/DOMTokenList.cpp:
     29        (WebCore::DOMTokenList::setValue):
     30        * html/DOMTokenList.h:
     31        * html/DOMTokenList.idl:
     32        * html/HTMLAnchorElement.idl:
     33        * html/HTMLAreaElement.idl:
     34        * html/HTMLElement.cpp:
     35        * html/HTMLElement.idl:
     36        * html/HTMLIFrameElement.cpp:
     37        (WebCore::HTMLIFrameElement::sandbox):
     38        * html/HTMLIFrameElement.h:
     39        * html/HTMLIFrameElement.idl:
     40        * html/HTMLLinkElement.cpp:
     41        (WebCore::HTMLLinkElement::sizes):
     42        * html/HTMLLinkElement.h:
     43        * html/HTMLLinkElement.idl:
     44        * html/HTMLOutputElement.cpp:
     45        (WebCore::HTMLOutputElement::htmlFor):
     46        * html/HTMLOutputElement.h:
     47        * html/HTMLOutputElement.idl:
     48        * html/HTMLTableCellElement.idl:
     49        * page/DOMWindow.cpp:
     50        * page/DOMWindow.idl:
     51
    1522016-02-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    253
  • trunk/Source/WebCore/DerivedSources.cpp

    r195954 r196123  
    143143#include "JSDOMSecurityPolicy.cpp"
    144144#include "JSDOMSelection.cpp"
    145 #include "JSDOMSettableTokenList.cpp"
    146145#include "JSDOMStringList.cpp"
    147146#include "JSDOMStringMap.cpp"
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r196031 r196123  
    17481748      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    17491749    </ClCompile>
    1750     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.cpp">
    1751       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    1752       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    1753       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    1754       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    1755       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    1756       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
    1757       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    1758       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    1759       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    1760       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    1761       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    1762       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    1763     </ClCompile>
    17641750    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringList.cpp">
    17651751      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     
    1623916225    <ClCompile Include="..\html\DateTimeLocalInputType.cpp" />
    1624016226    <ClCompile Include="..\html\DOMFormData.cpp" />
    16241     <ClCompile Include="..\html\DOMSettableTokenList.cpp" />
    1624216227    <ClCompile Include="..\html\DOMTokenList.cpp" />
    1624316228    <ClCompile Include="..\html\DOMURL.cpp" />
     
    1991319898    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMPluginArray.h" />
    1991419899    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSelection.h" />
    19915     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.h" />
    1991619900    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringList.h" />
    1991719901    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMStringMap.h" />
     
    2229322277    <ClInclude Include="..\html\DateTimeLocalInputType.h" />
    2229422278    <ClInclude Include="..\html\DOMFormData.h" />
    22295     <ClInclude Include="..\html\DOMSettableTokenList.h" />
    2229622279    <ClInclude Include="..\html\DOMTokenList.h" />
    2229722280    <ClInclude Include="..\html\DOMURL.h" />
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r195948 r196123  
    36363636      <Filter>html</Filter>
    36373637    </ClCompile>
    3638     <ClCompile Include="..\html\DOMSettableTokenList.cpp">
    3639       <Filter>html</Filter>
    3640     </ClCompile>
    36413638    <ClCompile Include="..\html\DOMTokenList.cpp">
    36423639      <Filter>html</Filter>
     
    52195216    </ClCompile>
    52205217    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSelection.cpp">
    5221       <Filter>DerivedSources</Filter>
    5222     </ClCompile>
    5223     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.cpp">
    52245218      <Filter>DerivedSources</Filter>
    52255219    </ClCompile>
     
    1080210796      <Filter>html</Filter>
    1080310797    </ClInclude>
    10804     <ClInclude Include="..\html\DOMSettableTokenList.h">
    10805       <Filter>html</Filter>
    10806     </ClInclude>
    1080710798    <ClInclude Include="..\html\DOMTokenList.h">
    1080810799      <Filter>html</Filter>
     
    1264412635    </ClInclude>
    1264512636    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSelection.h">
    12646       <Filter>DerivedSources</Filter>
    12647     </ClInclude>
    12648     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDOMSettableTokenList.h">
    1264912637      <Filter>DerivedSources</Filter>
    1265012638    </ClInclude>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r196118 r196123  
    18671867                4A9CC82016BF9BB400EC645A /* InspectorCSSOMWrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */; };
    18681868                4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */; };
    1869                 4ACBC0C312713CCA0094F9B2 /* DOMSettableTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0C012713CCA0094F9B2 /* DOMSettableTokenList.cpp */; };
    18701869                4ACBC0C412713CCA0094F9B2 /* DOMSettableTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */; };
    1871                 4ACBC0CA12713D0A0094F9B2 /* JSDOMSettableTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0C812713D0A0094F9B2 /* JSDOMSettableTokenList.cpp */; };
    1872                 4ACBC0CB12713D0A0094F9B2 /* JSDOMSettableTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0C912713D0A0094F9B2 /* JSDOMSettableTokenList.h */; };
    18731870                4AD01008127E642A0015035F /* HTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD01005127E642A0015035F /* HTMLOutputElement.cpp */; };
    18741871                4AD01009127E642A0015035F /* HTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD01006127E642A0015035F /* HTMLOutputElement.h */; };
     
    93479344                4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCSSOMWrappers.cpp; sourceTree = "<group>"; };
    93489345                4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCSSOMWrappers.h; sourceTree = "<group>"; };
    9349                 4ACBC0C012713CCA0094F9B2 /* DOMSettableTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSettableTokenList.cpp; sourceTree = "<group>"; };
    93509346                4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSettableTokenList.h; sourceTree = "<group>"; };
    93519347                4ACBC0C212713CCA0094F9B2 /* DOMSettableTokenList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMSettableTokenList.idl; sourceTree = "<group>"; };
    9352                 4ACBC0C812713D0A0094F9B2 /* JSDOMSettableTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMSettableTokenList.cpp; sourceTree = "<group>"; };
    9353                 4ACBC0C912713D0A0094F9B2 /* JSDOMSettableTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMSettableTokenList.h; sourceTree = "<group>"; };
    93549348                4AD01005127E642A0015035F /* HTMLOutputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOutputElement.cpp; sourceTree = "<group>"; };
    93559349                4AD01006127E642A0015035F /* HTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLOutputElement.h; sourceTree = "<group>"; };
     
    1896018954                                2ED609BB1145B07100C8684E /* DOMFormData.h */,
    1896118955                                2E0888C3114883A900AF4265 /* DOMFormData.idl */,
    18962                                 4ACBC0C012713CCA0094F9B2 /* DOMSettableTokenList.cpp */,
    1896318956                                4ACBC0C112713CCA0094F9B2 /* DOMSettableTokenList.h */,
    1896418957                                4ACBC0C212713CCA0094F9B2 /* DOMSettableTokenList.idl */,
     
    1999719990                                FB91392916AE4FC0001FE682 /* JSDOMPath.cpp */,
    1999819991                                FB91392816AE4FC0001FE682 /* JSDOMPath.h */,
    19999                                 4ACBC0C812713D0A0094F9B2 /* JSDOMSettableTokenList.cpp */,
    20000                                 4ACBC0C912713D0A0094F9B2 /* JSDOMSettableTokenList.h */,
    2000119992                                7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */,
    2000219993                                7694563B1214D97C0007CBAE /* JSDOMTokenList.h */,
     
    2632826319                                E172AF901811BC3700FBADB9 /* JSDOMPromise.h in Headers */,
    2632926320                                BC5A86B60C3367E800EEA649 /* JSDOMSelection.h in Headers */,
    26330                                 4ACBC0CB12713D0A0094F9B2 /* JSDOMSettableTokenList.h in Headers */,
    2633126321                                C5137CF311A58378004ADB99 /* JSDOMStringList.h in Headers */,
    2633226322                                BC64649811D82349006455B0 /* JSDOMStringMap.h in Headers */,
     
    2934729337                                2D9A246F15B9BD2F00D34527 /* DOMSecurityPolicy.cpp in Sources */,
    2934829338                                BC5A86840C33676000EEA649 /* DOMSelection.cpp in Sources */,
    29349                                 4ACBC0C312713CCA0094F9B2 /* DOMSettableTokenList.cpp in Sources */,
    2935029339                                C55610F111A704EB00B82D27 /* DOMStringList.cpp in Sources */,
    2935129340                                0FF5025C102BA9010066F39A /* DOMStyleMedia.mm in Sources */,
     
    2999129980                                E172AF8F1811BC3700FBADB9 /* JSDOMPromise.cpp in Sources */,
    2999229981                                BC5A86B50C3367E800EEA649 /* JSDOMSelection.cpp in Sources */,
    29993                                 4ACBC0CA12713D0A0094F9B2 /* JSDOMSettableTokenList.cpp in Sources */,
    2999429982                                C5137CF211A58378004ADB99 /* JSDOMStringList.cpp in Sources */,
    2999529983                                9A1B6F97158869C80011A8C4 /* JSDOMStringListCustom.cpp in Sources */,
  • trunk/Source/WebCore/dom/Element.idl

    r195686 r196123  
    127127
    128128    [Reflect=class] attribute DOMString className;
    129     readonly attribute DOMTokenList classList;
     129    [PutForwards=value] readonly attribute DOMTokenList classList;
    130130
    131131#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
  • trunk/Source/WebCore/dom/Node.h

    r195538 r196123  
    4646class ClassCollection;
    4747class ContainerNode;
    48 class DOMSettableTokenList;
     48class DOMTokenList;
    4949class Document;
    5050class Element;
  • trunk/Source/WebCore/dom/NodeRareData.h

    r191955 r196123  
    2525#include "ChildNodeList.h"
    2626#include "ClassCollection.h"
    27 #include "DOMSettableTokenList.h"
     27#include "DOMTokenList.h"
    2828#include "HTMLCollection.h"
    2929#include "HTMLNames.h"
  • trunk/Source/WebCore/html/AttributeDOMTokenList.h

    r190189 r196123  
    2727#define AttributeDOMTokenList_h
    2828
    29 #include "DOMSettableTokenList.h"
     29#include "DOMTokenList.h"
    3030#include "Element.h"
    3131
    3232namespace WebCore {
    3333
    34 class AttributeDOMTokenList final : public DOMSettableTokenList {
     34class AttributeDOMTokenList final : public DOMTokenList {
    3535    WTF_MAKE_FAST_ALLOCATED;
    3636public:
  • trunk/Source/WebCore/html/DOMSettableTokenList.h

    r190189 r196123  
    3333namespace WebCore {
    3434
    35 typedef int ExceptionCode;
    36 
     35// Only used by ObjC and GObject bindings.
    3736class DOMSettableTokenList : public DOMTokenList {
    3837    WTF_MAKE_FAST_ALLOCATED;
    39 public:
    40     void setValue(const String&);
    41 
    42     // Make public.
    43     using DOMTokenList::value;
    4438};
    4539
  • trunk/Source/WebCore/html/DOMSettableTokenList.idl

    r159061 r196123  
    2323 */
    2424
     25#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     26
    2527[
     28    NoInterfaceObject,
    2629    JSGenerateToJSObject,
    2730    SkipVTableValidation,
     
    3235};
    3336
     37#endif
  • trunk/Source/WebCore/html/DOMTokenList.cpp

    r190189 r196123  
    11/*
    22 * Copyright (C) 2010 Google Inc. All rights reserved.
    3  * Copyright (C) 2015 Apple Inc. All rights reserved.
     3 * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
    44 *
    55 * Redistribution and use in source and binary forms, with or without
     
    159159}
    160160
     161void DOMTokenList::setValue(const String& value)
     162{
     163    setValueInternal(value);
     164    updateAfterTokenChange();
     165}
     166
    161167void DOMTokenList::setValueInternal(const WTF::String& value)
    162168{
  • trunk/Source/WebCore/html/DOMTokenList.h

    r190189 r196123  
    11/*
    22 * Copyright (C) 2010 Google Inc. All rights reserved.
    3  * Copyright (C) 2015 Apple Inc. All rights reserved.
     3 * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
    44 *
    55 * Redistribution and use in source and binary forms, with or without
     
    5959    virtual Element* element() const { return nullptr; }
    6060
     61    void setValue(const String&);
     62    const AtomicString& value() const;
     63
    6164protected:
    6265    DOMTokenList() = default;
    63     const AtomicString& value() const;
    6466    void setValueInternal(const String&);
    6567
  • trunk/Source/WebCore/html/DOMTokenList.idl

    r189969 r196123  
    11/*
    22 * Copyright (C) 2010, Google Inc. All rights reserved.
     3 * Copyright (C) 2016, Apple Inc. All rights reserved.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
     
    3435    [RaisesException, Custom] boolean toggle(DOMString token, optional boolean force);
    3536
     37    attribute DOMString value;
     38
    3639#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    3740    [NotEnumerable] DOMString toString();
  • trunk/Source/WebCore/html/HTMLAnchorElement.idl

    r190030 r196123  
    2828
    2929    // FIXME: This is supposed to be:
    30     // [PutForwards=value] readonly attribute DOMSettableTokenList ping;
     30    // [PutForwards=value] readonly attribute DOMTokenList ping;
    3131    [Reflect] attribute DOMString ping;
    3232
     
    7171#endif
    7272
    73     readonly attribute DOMTokenList relList;
     73    [PutForwards=value] readonly attribute DOMTokenList relList;
    7474};
    7575
  • trunk/Source/WebCore/html/HTMLAreaElement.idl

    r190030 r196123  
    2626
    2727    // FIXME: This is supposed to be:
    28     // [PutForwards=value] readonly attribute DOMSettableTokenList ping;
     28    // [PutForwards=value] readonly attribute DOMTokenList ping;
    2929    [Reflect] attribute DOMString ping;
    3030
     
    5050#endif
    5151
    52     readonly attribute DOMTokenList relList;
     52    [PutForwards=value] readonly attribute DOMTokenList relList;
    5353};
    5454
  • trunk/Source/WebCore/html/HTMLElement.cpp

    r195953 r196123  
    3030#include "CSSValueKeywords.h"
    3131#include "CSSValuePool.h"
    32 #include "DOMSettableTokenList.h"
     32#include "DOMTokenList.h"
    3333#include "DocumentFragment.h"
    3434#include "ElementAncestorIterator.h"
  • trunk/Source/WebCore/html/HTMLElement.idl

    r195087 r196123  
    4040             [Reflect] attribute DOMString webkitdropzone;
    4141             // FIXME: Support the standard HTML equivalent.
    42              // [PutForwards=value] readonly attribute DOMSettableTokenList dropzone;
     42             // [PutForwards=value] readonly attribute DOMTokenList dropzone;
    4343
    4444             [Reflect] attribute boolean hidden;
  • trunk/Source/WebCore/html/HTMLIFrameElement.cpp

    r194496 r196123  
    4949}
    5050
    51 DOMSettableTokenList& HTMLIFrameElement::sandbox()
     51DOMTokenList& HTMLIFrameElement::sandbox()
    5252{
    5353    if (!m_sandbox)
  • trunk/Source/WebCore/html/HTMLIFrameElement.h

    r191388 r196123  
    3535    static Ref<HTMLIFrameElement> create(const QualifiedName&, Document&);
    3636
    37     DOMSettableTokenList& sandbox();
     37    DOMTokenList& sandbox();
    3838
    3939private:
  • trunk/Source/WebCore/html/HTMLIFrameElement.idl

    r191388 r196123  
    3131    [Reflect] attribute DOMString sandbox;
    3232#else
    33     [PutForwards=value] readonly attribute DOMSettableTokenList sandbox;
     33    [PutForwards=value] readonly attribute DOMTokenList sandbox;
    3434#endif
    3535
  • trunk/Source/WebCore/html/HTMLLinkElement.cpp

    r196080 r196123  
    368368}
    369369
    370 DOMSettableTokenList& HTMLLinkElement::sizes()
     370DOMTokenList& HTMLLinkElement::sizes()
    371371{
    372372    if (!m_sizes)
  • trunk/Source/WebCore/html/HTMLLinkElement.h

    r190189 r196123  
    6666    bool isDisabled() const { return m_disabledState == Disabled; }
    6767    bool isEnabledViaScript() const { return m_disabledState == EnabledViaScript; }
    68     DOMSettableTokenList& sizes();
     68    DOMTokenList& sizes();
    6969
    7070    void dispatchPendingEvent(LinkEventSender*);
  • trunk/Source/WebCore/html/HTMLLinkElement.idl

    r190030 r196123  
    2929    [Reflect] attribute DOMString rev;
    3030#if (defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT) || (defined(LANGUAGE_GOBJECT) || LANGUAGE_GOBJECT)
    31     [PutForwards=value] readonly attribute DOMSettableTokenList sizes;
     31    [PutForwards=value] readonly attribute DOMTokenList sizes;
    3232#endif
    3333    [Reflect] attribute DOMString target;
     
    4242#endif
    4343
    44     readonly attribute DOMTokenList relList;
     44    [PutForwards=value] readonly attribute DOMTokenList relList;
    4545};
    4646
  • trunk/Source/WebCore/html/HTMLOutputElement.cpp

    r194819 r196123  
    128128}
    129129
    130 DOMSettableTokenList& HTMLOutputElement::htmlFor()
     130DOMTokenList& HTMLOutputElement::htmlFor()
    131131{
    132132    if (!m_tokens)
  • trunk/Source/WebCore/html/HTMLOutputElement.h

    r190189 r196123  
    4545    String defaultValue() const;
    4646    void setDefaultValue(const String&);
    47     DOMSettableTokenList& htmlFor();
     47    DOMTokenList& htmlFor();
    4848   
    4949    virtual bool canContainRangeEndPoint() const override { return false; }
  • trunk/Source/WebCore/html/HTMLOutputElement.idl

    r190189 r196123  
    2424
    2525interface HTMLOutputElement : HTMLElement {
    26     [PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
     26    [PutForwards=value] readonly attribute DOMTokenList htmlFor;
    2727
    2828    readonly attribute HTMLFormElement form;
  • trunk/Source/WebCore/html/HTMLTableCellElement.idl

    r191247 r196123  
    2929
    3030    // FIXME: This is supposed to be:
    31     // [PutForwards=value] readonly attribute DOMSettableTokenList headers;
     31    // [PutForwards=value] readonly attribute DOMTokenList headers;
    3232    [Reflect] attribute DOMString headers;
    3333
  • trunk/Source/WebCore/page/DOMWindow.cpp

    r196080 r196123  
    4141#include "DOMApplicationCache.h"
    4242#include "DOMSelection.h"
    43 #include "DOMSettableTokenList.h"
    4443#include "DOMStringList.h"
    4544#include "DOMTimer.h"
  • trunk/Source/WebCore/page/DOMWindow.idl

    r195953 r196123  
    197197    // Additional constructors.
    198198    [CustomGetter, CustomConstructor] attribute HTMLImageElementNamedConstructor Image; // Usable with new operator
     199    attribute DOMTokenListConstructor DOMSettableTokenList; // Map DOMSettableTokenList to DOMTokenList for backward compatibility.
    199200
    200201    [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchConstructor Touch; // Usable with the new operator
Note: See TracChangeset for help on using the changeset viewer.