<!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>[190173] 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/190173">190173</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-23 09:06:00 -0700 (Wed, 23 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/190168">r190168</a>.
https://bugs.webkit.org/show_bug.cgi?id=149502
it broke debug builds. (Requested by zalan on #webkit).
Reverted changeset:
"HTMLOutputElement.htmlFor should be settable"
https://bugs.webkit.org/show_bug.cgi?id=149418
http://trac.webkit.org/changeset/190168</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLOutputElementdomsettabletokenlistexpectedtxt">trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLOutputElementscripttestsdomsettabletokenlistjs">trunk/LayoutTests/fast/dom/HTMLOutputElement/script-tests/dom-settable-token-list.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlAttributeDOMTokenListcpp">trunk/Source/WebCore/html/AttributeDOMTokenList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlAttributeDOMTokenListh">trunk/Source/WebCore/html/AttributeDOMTokenList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMSettableTokenListcpp">trunk/Source/WebCore/html/DOMSettableTokenList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMSettableTokenListh">trunk/Source/WebCore/html/DOMSettableTokenList.h</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="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementh">trunk/Source/WebCore/html/HTMLLinkElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOutputElementcpp">trunk/Source/WebCore/html/HTMLOutputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOutputElementh">trunk/Source/WebCore/html/HTMLOutputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOutputElementidl">trunk/Source/WebCore/html/HTMLOutputElement.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementsizessetterexpectedtxt">trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementsizessetterhtml">trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/LayoutTests/ChangeLog 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-09-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r190168.
+ https://bugs.webkit.org/show_bug.cgi?id=149502
+
+ it broke debug builds. (Requested by zalan on #webkit).
+
+ Reverted changeset:
+
+ "HTMLOutputElement.htmlFor should be settable"
+ https://bugs.webkit.org/show_bug.cgi?id=149418
+ http://trac.webkit.org/changeset/190168
+
+2015-09-23 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r190160.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149501
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementsizessetterexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter-expected.txt (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter-expected.txt 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter-expected.txt 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-Tests that the HTMLLinkElement.sizes setter updates the associated sizes attribute
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS link.sizes.__proto__ is DOMSettableTokenList.prototype
-link.sizes = '10x10 20x20'
-PASS String(link.sizes) is "10x10 20x20"
-PASS link.getAttribute('sizes') is "10x10 20x20"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementsizessetterhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter.html (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter.html 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/sizes-setter.html 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<body>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-description("Tests that the HTMLLinkElement.sizes setter updates the associated sizes attribute");
-
-var link = document.createElement("link");
-shouldBe("link.sizes.__proto__", "DOMSettableTokenList.prototype");
-evalAndLog("link.sizes = '10x10 20x20'");
-shouldBeEqualToString("String(link.sizes)", "10x10 20x20");
-shouldBeEqualToString("link.getAttribute('sizes')", "10x10 20x20");
-</script>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLOutputElementdomsettabletokenlistexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/LayoutTests/fast/dom/HTMLOutputElement/dom-settable-token-list-expected.txt 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -4,10 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> - Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/
</span><del>-PASS element.htmlFor.__proto__ is DOMSettableTokenList.prototype
-PASS String(element.htmlFor) is "y z"
-PASS element.getAttribute("for") is "y z"
-PASS String(element.htmlFor) is "r s t"
</del><ins>+PASS String(element.htmlFor) is "x"
</ins><span class="cx"> PASS element.htmlFor.length is 0
</span><span class="cx"> PASS element.htmlFor.length is 1
</span><span class="cx"> PASS element.htmlFor.length is 1
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLOutputElementscripttestsdomsettabletokenlistjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLOutputElement/script-tests/dom-settable-token-list.js (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLOutputElement/script-tests/dom-settable-token-list.js 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/LayoutTests/fast/dom/HTMLOutputElement/script-tests/dom-settable-token-list.js 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -14,14 +14,10 @@
</span><span class="cx">
</span><span class="cx"> debug('- Tests from http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/');
</span><span class="cx">
</span><del>-// HTMLOutputElement::htmlFor should be settable.
</del><ins>+// HTMLOutputElement::htmlFor is readonly attribute.
</ins><span class="cx"> createElement('x');
</span><del>-shouldBe('element.htmlFor.__proto__', 'DOMSettableTokenList.prototype');
-element.htmlFor = 'y z';
-shouldBeEqualToString('String(element.htmlFor)', 'y z');
-shouldBeEqualToString('element.getAttribute("for")', 'y z');
-element.setAttribute('for', 'r s t');
-shouldBeEqualToString('String(element.htmlFor)', 'r s t');
</del><ins>+element.htmlFor = 'y';
+shouldBeEqualToString('String(element.htmlFor)', 'x');
</ins><span class="cx">
</span><span class="cx"> // http://simon.html5.org/test/html/dom/reflecting/DOMTokenList/getting/001.htm
</span><span class="cx"> createElement('');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/ChangeLog 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-09-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r190168.
+ https://bugs.webkit.org/show_bug.cgi?id=149502
+
+ it broke debug builds. (Requested by zalan on #webkit).
+
+ Reverted changeset:
+
+ "HTMLOutputElement.htmlFor should be settable"
+ https://bugs.webkit.org/show_bug.cgi?id=149418
+ http://trac.webkit.org/changeset/190168
+
+2015-09-23 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r190160.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149501
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlAttributeDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/AttributeDOMTokenList.cpp (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/AttributeDOMTokenList.cpp 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/AttributeDOMTokenList.cpp 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> : m_element(element)
</span><span class="cx"> , m_attributeName(attributeName)
</span><span class="cx"> {
</span><del>- setValueInternal(m_element.getAttribute(m_attributeName));
</del><ins>+ setValue(m_element.getAttribute(m_attributeName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AttributeDOMTokenList::attributeValueChanged(const AtomicString& newValue)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> if (m_isUpdatingAttributeValue)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- setValueInternal(newValue);
</del><ins>+ DOMTokenList::setValue(newValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AttributeDOMTokenList::updateAfterTokenChange()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlAttributeDOMTokenListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/AttributeDOMTokenList.h (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/AttributeDOMTokenList.h 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/AttributeDOMTokenList.h 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -26,13 +26,12 @@
</span><span class="cx"> #ifndef AttributeDOMTokenList_h
</span><span class="cx"> #define AttributeDOMTokenList_h
</span><span class="cx">
</span><del>-#include "DOMSettableTokenList.h"
</del><ins>+#include "DOMTokenList.h"
</ins><span class="cx"> #include "Element.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class AttributeDOMTokenList final : public DOMSettableTokenList {
- WTF_MAKE_FAST_ALLOCATED;
</del><ins>+class AttributeDOMTokenList final : public DOMTokenList {
</ins><span class="cx"> public:
</span><span class="cx"> AttributeDOMTokenList(Element&, const QualifiedName& attributeName);
</span><span class="cx"> void attributeValueChanged(const AtomicString&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMSettableTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMSettableTokenList.cpp (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMSettableTokenList.cpp 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/DOMSettableTokenList.cpp 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -28,10 +28,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void DOMSettableTokenList::setValue(const String& value)
</del><ins>+void DOMSettableTokenList::ref()
</ins><span class="cx"> {
</span><del>- setValueInternal(value);
- updateAfterTokenChange();
</del><ins>+ RefCounted<DOMSettableTokenList>::ref();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void DOMSettableTokenList::deref()
+{
+ RefCounted<DOMSettableTokenList>::deref();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMSettableTokenListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMSettableTokenList.h (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMSettableTokenList.h 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/DOMSettableTokenList.h 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -28,19 +28,24 @@
</span><span class="cx">
</span><span class="cx"> #include "DOMTokenList.h"
</span><span class="cx"> #include "SpaceSplitString.h"
</span><ins>+#include <wtf/RefCounted.h>
</ins><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> typedef int ExceptionCode;
</span><span class="cx">
</span><del>-class DOMSettableTokenList : public DOMTokenList {
</del><ins>+class DOMSettableTokenList final : public DOMTokenList, public RefCounted<DOMSettableTokenList> {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- void setValue(const String&);
</del><ins>+ static Ref<DOMSettableTokenList> create()
+ {
+ return adoptRef(*new DOMSettableTokenList);
+ }
</ins><span class="cx">
</span><span class="cx"> // Make public.
</span><span class="cx"> using DOMTokenList::value;
</span><ins>+ using DOMTokenList::setValue;
</ins><span class="cx">
</span><span class="cx"> virtual void ref() override;
</span><span class="cx"> virtual void deref() override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.cpp (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.cpp 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/DOMTokenList.cpp 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> return m_cachedValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DOMTokenList::setValueInternal(const WTF::String& value)
</del><ins>+void DOMTokenList::setValue(const String& value)
</ins><span class="cx"> {
</span><span class="cx"> // Clear tokens but not capacity.
</span><span class="cx"> m_tokens.shrink(0);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMTokenListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMTokenList.h (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMTokenList.h 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/DOMTokenList.h 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> DOMTokenList() = default;
</span><span class="cx"> const AtomicString& value() const;
</span><del>- void setValueInternal(const String&);
</del><ins>+ void setValue(const String&);
</ins><span class="cx">
</span><span class="cx"> virtual void updateAfterTokenChange() { m_cachedValue = nullAtom; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> inline HTMLLinkElement::HTMLLinkElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><span class="cx"> : HTMLElement(tagName, document)
</span><span class="cx"> , m_linkLoader(*this)
</span><ins>+ , m_sizes(DOMSettableTokenList::create())
</ins><span class="cx"> , m_disabledState(Unset)
</span><span class="cx"> , m_loading(false)
</span><span class="cx"> , m_createdByParser(createdByParser)
</span><span class="lines">@@ -158,8 +159,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (name == sizesAttr) {
</span><del>- if (m_sizes)
- m_sizes->attributeValueChanged(value);
</del><ins>+ m_sizes->setValue(value);
</ins><span class="cx"> process();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -367,13 +367,6 @@
</span><span class="cx"> return m_sheet->contents().isLoading();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DOMSettableTokenList& HTMLLinkElement::sizes()
-{
- if (!m_sizes)
- m_sizes = std::make_unique<AttributeDOMTokenList>(*this, sizesAttr);
- return *m_sizes;
-}
-
</del><span class="cx"> void HTMLLinkElement::linkLoaded()
</span><span class="cx"> {
</span><span class="cx"> dispatchEvent(Event::create(eventNames().loadEvent, false, false));
</span><span class="lines">@@ -482,9 +475,9 @@
</span><span class="cx"> return m_relAttribute.iconType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String HTMLLinkElement::iconSizes()
</del><ins>+String HTMLLinkElement::iconSizes() const
</ins><span class="cx"> {
</span><del>- return sizes().toString();
</del><ins>+ return m_sizes->toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<URL>& urls) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.h 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> #ifndef HTMLLinkElement_h
</span><span class="cx"> #define HTMLLinkElement_h
</span><span class="cx">
</span><del>-#include "AttributeDOMTokenList.h"
</del><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CachedStyleSheetClient.h"
</span><span class="cx"> #include "CachedResourceHandle.h"
</span><ins>+#include "DOMSettableTokenList.h"
</ins><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "LinkLoader.h"
</span><span class="cx"> #include "LinkLoaderClient.h"
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> IconType iconType() const;
</span><span class="cx">
</span><span class="cx"> // the icon size string as parsed from the HTML attribute
</span><del>- String iconSizes();
</del><ins>+ String iconSizes() const;
</ins><span class="cx">
</span><span class="cx"> CSSStyleSheet* sheet() const { return m_sheet.get(); }
</span><span class="cx">
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> bool isDisabled() const { return m_disabledState == Disabled; }
</span><span class="cx"> bool isEnabledViaScript() const { return m_disabledState == EnabledViaScript; }
</span><del>- DOMSettableTokenList& sizes();
</del><ins>+ DOMSettableTokenList& sizes() { return m_sizes.get(); }
</ins><span class="cx">
</span><span class="cx"> void dispatchPendingEvent(LinkEventSender*);
</span><span class="cx"> static void dispatchPendingLoadEvents();
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> String m_type;
</span><span class="cx"> String m_media;
</span><del>- std::unique_ptr<AttributeDOMTokenList> m_sizes;
</del><ins>+ Ref<DOMSettableTokenList> m_sizes;
</ins><span class="cx"> DisabledState m_disabledState;
</span><span class="cx"> LinkRelAttribute m_relAttribute;
</span><span class="cx"> bool m_loading;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOutputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOutputElement.cpp (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOutputElement.cpp 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/HTMLOutputElement.cpp 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -37,13 +37,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-using namespace HTMLNames;
-
</del><span class="cx"> inline HTMLOutputElement::HTMLOutputElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
</span><span class="cx"> : HTMLFormControlElement(tagName, document, form)
</span><span class="cx"> , m_isDefaultValueMode(true)
</span><span class="cx"> , m_isSetTextContentInProgress(false)
</span><span class="cx"> , m_defaultValue("")
</span><ins>+ , m_tokens(DOMSettableTokenList::create())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -65,13 +64,17 @@
</span><span class="cx">
</span><span class="cx"> void HTMLOutputElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><del>- if (name == forAttr) {
- if (m_tokens)
- m_tokens->attributeValueChanged(value);
- } else
</del><ins>+ if (name == HTMLNames::forAttr)
+ setFor(value);
+ else
</ins><span class="cx"> HTMLFormControlElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLOutputElement::setFor(const String& value)
+{
+ m_tokens->setValue(value);
+}
+
</ins><span class="cx"> void HTMLOutputElement::childrenChanged(const ChildChange& change)
</span><span class="cx"> {
</span><span class="cx"> HTMLFormControlElement::childrenChanged(change);
</span><span class="lines">@@ -126,13 +129,6 @@
</span><span class="cx"> setTextContentInternal(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DOMSettableTokenList& HTMLOutputElement::htmlFor()
-{
- if (!m_tokens)
- m_tokens = std::make_unique<AttributeDOMTokenList>(*this, forAttr);
- return *m_tokens;
-}
-
</del><span class="cx"> void HTMLOutputElement::setTextContentInternal(const String& value)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isSetTextContentInProgress);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOutputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOutputElement.h (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOutputElement.h 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/HTMLOutputElement.h 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #ifndef HTMLOutputElement_h
</span><span class="cx"> #define HTMLOutputElement_h
</span><span class="cx">
</span><del>-#include "AttributeDOMTokenList.h"
</del><ins>+#include "DOMSettableTokenList.h"
</ins><span class="cx"> #include "HTMLFormControlElement.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,7 +44,8 @@
</span><span class="cx"> void setValue(const String&);
</span><span class="cx"> String defaultValue() const;
</span><span class="cx"> void setDefaultValue(const String&);
</span><del>- DOMSettableTokenList& htmlFor();
</del><ins>+ void setFor(const String&);
+ DOMSettableTokenList& htmlFor() { return m_tokens.get(); }
</ins><span class="cx">
</span><span class="cx"> virtual bool canContainRangeEndPoint() const override { return false; }
</span><span class="cx">
</span><span class="lines">@@ -65,7 +66,7 @@
</span><span class="cx"> bool m_isDefaultValueMode;
</span><span class="cx"> bool m_isSetTextContentInProgress;
</span><span class="cx"> String m_defaultValue;
</span><del>- std::unique_ptr<AttributeDOMTokenList> m_tokens;
</del><ins>+ Ref<DOMSettableTokenList> m_tokens;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOutputElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOutputElement.idl (190172 => 190173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOutputElement.idl 2015-09-23 15:34:16 UTC (rev 190172)
+++ trunk/Source/WebCore/html/HTMLOutputElement.idl 2015-09-23 16:06:00 UTC (rev 190173)
</span><span class="lines">@@ -23,7 +23,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> interface HTMLOutputElement : HTMLElement {
</span><del>- [PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
</del><ins>+ // FIXME: This is supposed to be:
+ // [PutForwards=value] readonly attribute DOMSettableTokenList htmlFor;
+ readonly attribute DOMSettableTokenList htmlFor;
</ins><span class="cx">
</span><span class="cx"> readonly attribute HTMLFormElement form;
</span><span class="cx"> [Reflect] attribute DOMString name;
</span></span></pre>
</div>
</div>
</body>
</html>