<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204161] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204161">204161</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-04 19:59:13 -0700 (Thu, 04 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for DOMTokenList.replace()
https://bugs.webkit.org/show_bug.cgi?id=160573
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
Rebaseline several W3C tests now that more checks are passing.
* web-platform-tests/dom/interfaces-expected.txt:
* web-platform-tests/dom/nodes/Element-classlist-expected.txt:
Source/WebCore:
Add support for DOMTokenList.replace():
https://dom.spec.whatwg.org/#dom-domtokenlist-replace
No new tests, rebaselined existing tests.
* html/DOMTokenList.cpp:
(WebCore::tokenContainsHTMLSpace):
(WebCore::DOMTokenList::validateToken):
(WebCore::DOMTokenList::replace):
* html/DOMTokenList.h:
* html/DOMTokenList.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomnodesElementclasslistexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Element-classlist-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListcpp">trunk/Source/WebCore/html/DOMTokenList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListh">trunk/Source/WebCore/html/DOMTokenList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMTokenListidl">trunk/Source/WebCore/html/DOMTokenList.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-08-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Add support for DOMTokenList.replace()
+ https://bugs.webkit.org/show_bug.cgi?id=160573
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline several W3C tests now that more checks are passing.
+
+ * web-platform-tests/dom/interfaces-expected.txt:
+ * web-platform-tests/dom/nodes/Element-classlist-expected.txt:
+
+2016-08-04 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move insertAdjacent*() API from HTMLElement to Element
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160567
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/interfaces-expected.txt 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -1506,7 +1506,7 @@
</span><span class="cx"> PASS DOMTokenList interface: operation add(DOMString)
</span><span class="cx"> PASS DOMTokenList interface: operation remove(DOMString)
</span><span class="cx"> PASS DOMTokenList interface: operation toggle(DOMString,boolean)
</span><del>-FAIL DOMTokenList interface: operation replace(DOMString,DOMString) assert_own_property: interface prototype object missing non-static operation expected property "replace" missing
</del><ins>+PASS DOMTokenList interface: operation replace(DOMString,DOMString)
</ins><span class="cx"> FAIL DOMTokenList interface: operation supports(DOMString) assert_own_property: interface prototype object missing non-static operation expected property "supports" missing
</span><span class="cx"> PASS DOMTokenList interface: attribute value
</span><span class="cx"> PASS DOMTokenList interface: stringifier
</span><span class="lines">@@ -1523,8 +1523,8 @@
</span><span class="cx"> PASS DOMTokenList interface: calling remove(DOMString) on document.body.classList with too few arguments must throw TypeError
</span><span class="cx"> PASS DOMTokenList interface: document.body.classList must inherit property "toggle" with the proper type (5)
</span><span class="cx"> PASS DOMTokenList interface: calling toggle(DOMString,boolean) on document.body.classList with too few arguments must throw TypeError
</span><del>-FAIL DOMTokenList interface: document.body.classList must inherit property "replace" with the proper type (6) assert_inherits: property "replace" not found in prototype chain
-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
</del><ins>+PASS DOMTokenList interface: document.body.classList must inherit property "replace" with the proper type (6)
+PASS DOMTokenList interface: calling replace(DOMString,DOMString) on document.body.classList with too few arguments must throw TypeError
</ins><span class="cx"> FAIL DOMTokenList interface: document.body.classList must inherit property "supports" with the proper type (7) assert_inherits: property "supports" not found in prototype chain
</span><span class="cx"> 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
</span><span class="cx"> PASS DOMTokenList interface: document.body.classList must inherit property "value" with the proper type (8)
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomnodesElementclasslistexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Element-classlist-expected.txt (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Element-classlist-expected.txt 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/Element-classlist-expected.txt 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -18,13 +18,13 @@
</span><span class="cx"> PASS .add(empty_string) must throw a SYNTAX_ERR
</span><span class="cx"> PASS .remove(empty_string) must throw a SYNTAX_ERR
</span><span class="cx"> PASS .toggle(empty_string) must throw a SYNTAX_ERR
</span><del>-FAIL .replace with empty_string must throw a SYNTAX_ERR assert_throws: function "function () { elem.classList.replace('', 'foo'); }" threw object "TypeError: elem.classList.replace is not a function. (In ..." that is not a DOMException SYNTAX_ERR: property "code" is equal to undefined, expected 12
</del><ins>+PASS .replace with empty_string must throw a SYNTAX_ERR
</ins><span class="cx"> PASS .contains(string_with_spaces) must return false
</span><span class="cx"> PASS .add(string_with_spaces) must throw an INVALID_CHARACTER_ERR
</span><span class="cx"> PASS .remove(string_with_spaces) must throw an INVALID_CHARACTER_ERR
</span><span class="cx"> PASS .toggle(string_with_spaces) must throw an INVALID_CHARACTER_ERR
</span><del>-FAIL .replace with string_with_spaces must throw a INVALID_CHARACTER_ERR assert_throws: function "function () { elem.classList.replace('z', 'a b'); }" threw object "TypeError: elem.classList.replace is not a function. (In ..." that is not a DOMException INVALID_CHARACTER_ERR: property "code" is equal to undefined, expected 5
-FAIL .replace with an already existing token foo.classList.replace is not a function. (In 'foo.classList.replace('token1', 'token3')', 'foo.classList.replace' is undefined)
</del><ins>+PASS .replace with string_with_spaces must throw a INVALID_CHARACTER_ERR
+PASS .replace with an already existing token
</ins><span class="cx"> PASS computed style must update when setting .className
</span><span class="cx"> PASS classList.contains must update when .className is changed
</span><span class="cx"> PASS classList.contains must be case sensitive
</span><span class="lines">@@ -54,14 +54,14 @@
</span><span class="cx"> PASS classList.toggle must not break case-sensitive CSS selector matching
</span><span class="cx"> PASS classList.toggle must be able to remove tokens
</span><span class="cx"> PASS classList.toggle must be case-sensitive when removing tokens
</span><del>-FAIL classList.replace replaces arguments passed, if they are present. secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('bar', 'baz')', 'secondelem.classList.replace' is undefined)
-FAIL classList.replace must replace existing tokens secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('foo', 'bar')', 'secondelem.classList.replace' is undefined)
-FAIL classList.replace must not break case-sensitive CSS selector matching assert_not_equals: got disallowed value "italic"
-FAIL classList.replace must replace duplicated tokens secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('token1', 'token3')', 'secondelem.classList.replace' is undefined)
-FAIL classList.replace must collapse whitespace around replaced tokens secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('token2', 'token4')', 'secondelem.classList.replace' is undefined)
-FAIL classList.replace must collapse whitespaces around each token secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('token2', 'token3')', 'secondelem.classList.replace' is undefined)
-FAIL classList.replace must collapse whitespaces around each token and remove duplicates secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('token2', 'token3')', 'secondelem.classList.replace' is undefined)
-FAIL classList.replace must collapse whitespace when replacing duplicate tokens secondelem.classList.replace is not a function. (In 'secondelem.classList.replace('token1', 'token3')', 'secondelem.classList.replace' is undefined)
</del><ins>+PASS classList.replace replaces arguments passed, if they are present.
+PASS classList.replace must replace existing tokens
+PASS classList.replace must not break case-sensitive CSS selector matching
+PASS classList.replace must replace duplicated tokens
+PASS classList.replace must collapse whitespace around replaced tokens
+PASS classList.replace must collapse whitespaces around each token
+PASS classList.replace must collapse whitespaces around each token and remove duplicates
+PASS classList.replace must collapse whitespace when replacing duplicate tokens
</ins><span class="cx"> PASS CSS class selectors must stop matching when all classes have been removed
</span><span class="cx"> PASS className must be empty when all classes have been removed
</span><span class="cx"> PASS classList must stringify to an empty string when all classes have been removed
</span><span class="lines">@@ -75,6 +75,6 @@
</span><span class="cx"> PASS classList.add should treat \f as a space
</span><span class="cx"> PASS classList.length must be read-only
</span><span class="cx"> PASS classList must have [PutForwards=value]
</span><del>-FAIL classList.replace should work foo.classList.replace is not a function. (In 'foo.classList.replace('token1', 'token2')', 'foo.classList.replace' is undefined)
</del><ins>+PASS classList.replace should work
</ins><span class="cx"> PASS classList.supports should throw
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/Source/WebCore/ChangeLog 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-08-04 Chris Dumez <cdumez@apple.com>
+
+ Add support for DOMTokenList.replace()
+ https://bugs.webkit.org/show_bug.cgi?id=160573
+
+ Reviewed by Alex Christensen.
+
+ Add support for DOMTokenList.replace():
+ https://dom.spec.whatwg.org/#dom-domtokenlist-replace
+
+ No new tests, rebaselined existing tests.
+
+ * html/DOMTokenList.cpp:
+ (WebCore::tokenContainsHTMLSpace):
+ (WebCore::DOMTokenList::validateToken):
+ (WebCore::DOMTokenList::replace):
+ * html/DOMTokenList.h:
+ * html/DOMTokenList.idl:
+
</ins><span class="cx"> 2016-08-04 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Some videos in iBooks erroneously go fullscreen
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.cpp (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.cpp 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/Source/WebCore/html/DOMTokenList.cpp 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -42,6 +42,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool tokenContainsHTMLSpace(const String& token)
+{
+ return token.find(isHTMLSpace) != notFound;
+}
+
</ins><span class="cx"> bool DOMTokenList::validateToken(const String& token, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (token.isEmpty()) {
</span><span class="lines">@@ -49,12 +54,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned length = token.length();
- for (unsigned i = 0; i < length; ++i) {
- if (isHTMLSpace(token[i])) {
- ec = INVALID_CHARACTER_ERR;
- return false;
- }
</del><ins>+ if (tokenContainsHTMLSpace(token)) {
+ ec = INVALID_CHARACTER_ERR;
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -150,6 +152,31 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DOMTokenList::replace(const AtomicString& token, const AtomicString& newToken, ExceptionCode& ec)
+{
+ if (token.isEmpty() || newToken.isEmpty()) {
+ ec = SYNTAX_ERR;
+ return;
+ }
+
+ if (tokenContainsHTMLSpace(token) || tokenContainsHTMLSpace(newToken)) {
+ ec = INVALID_CHARACTER_ERR;
+ return;
+ }
+
+ auto& tokens = this->tokens();
+ size_t index = tokens.find(token);
+ if (index == notFound)
+ return;
+
+ if (tokens.find(newToken) != notFound)
+ tokens.remove(index);
+ else
+ tokens[index] = newToken;
+
+ updateAssociatedAttributeFromTokens();
+}
+
</ins><span class="cx"> const AtomicString& DOMTokenList::value() const
</span><span class="cx"> {
</span><span class="cx"> if (m_cachedValue.isNull()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.h (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.h 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/Source/WebCore/html/DOMTokenList.h 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> void remove(const Vector<String>&, ExceptionCode&);
</span><span class="cx"> void remove(const AtomicString&, ExceptionCode&);
</span><span class="cx"> bool toggle(const AtomicString&, Optional<bool> force, ExceptionCode&);
</span><ins>+ void replace(const AtomicString& token, const AtomicString& newToken, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> const AtomicString& toString() const { return value(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.idl (204160 => 204161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.idl 2016-08-05 02:50:19 UTC (rev 204160)
+++ trunk/Source/WebCore/html/DOMTokenList.idl 2016-08-05 02:59:13 UTC (rev 204161)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> [RaisesException] void add(DOMString... tokens);
</span><span class="cx"> [RaisesException] void remove(DOMString... tokens);
</span><span class="cx"> [RaisesException] boolean toggle(DOMString token, optional boolean force);
</span><ins>+ [RaisesException] void replace(DOMString token, DOMString newToken);
</ins><span class="cx">
</span><span class="cx"> iterable<DOMString>;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>