<!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>[212522] 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/212522">212522</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 20:30:45 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre><input>.labels is empty if type changes from text->hidden->checkbox
https://bugs.webkit.org/show_bug.cgi?id=168358
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Re-sync web-platform-test from:
https://github.com/w3c/web-platform-tests/pull/4804
* web-platform-tests/html/semantics/forms/the-label-element/labelable-elements-expected.txt:
* web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html:
Source/WebCore:
We were invalidating LabelsNodeLists on 'for' attribute change.
We now also invalidate them of 'type' attribute change since
HTMLInputElements whose type is 'hidden' do not support labels.
No new tests, updated existing test.
* dom/Document.h:
* dom/LiveNodeList.h:
(WebCore::shouldInvalidateTypeOnAttributeChange):
* html/LabelsNodeList.cpp:
(WebCore::LabelsNodeList::LabelsNodeList):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsformsthelabelelementlabelableelementsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsformsthelabelelementlabelableelementshtml">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomLiveNodeListh">trunk/Source/WebCore/dom/LiveNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelsNodeListcpp">trunk/Source/WebCore/html/LabelsNodeList.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-16 Chris Dumez <cdumez@apple.com>
+
+ <input>.labels is empty if type changes from text->hidden->checkbox
+ https://bugs.webkit.org/show_bug.cgi?id=168358
+
+ Reviewed by Ryosuke Niwa.
+
+ Re-sync web-platform-test from:
+ https://github.com/w3c/web-platform-tests/pull/4804
+
+ * web-platform-tests/html/semantics/forms/the-label-element/labelable-elements-expected.txt:
+ * web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html:
+
</ins><span class="cx"> 2017-02-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Special URLs without a host are invalid
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsformsthelabelelementlabelableelementsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements-expected.txt (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements-expected.txt 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements-expected.txt 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> PASS Check if the button element is a labelable element
</span><span class="cx"> PASS Check if the button element can access 'labels'
</span><span class="cx"> PASS Check if the hidden input element is not a labelable element.
</span><del>-FAIL Check if the hidden input element can access 'labels' null is not an object (evaluating 'elem.labels.length')
</del><ins>+PASS Check if the hidden input element has null 'labels'
</ins><span class="cx"> PASS Check if the input element in radio state is a labelable element
</span><span class="cx"> PASS Check if the input element in radio state can access 'labels'
</span><span class="cx"> FAIL Check if the keygen element is not a labelable element assert_not_equals: got disallowed value Element node <keygen id="testkeygen"></keygen>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsformsthelabelelementlabelableelementshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/labelable-elements.html 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <script>
</span><del>-function testLabelsAttr(formElementId, labelElementId, hasLabels) {
</del><ins>+function testLabelsAttr(formElementId, labelElementId) {
</ins><span class="cx"> var elem = document.getElementById(formElementId);
</span><span class="cx"> if (labelElementId) {
</span><span class="cx"> assert_equals(elem.labels.length, 1);
</span><span class="lines">@@ -91,9 +91,25 @@
</span><span class="cx"> }, "Check if the hidden input element is not a labelable element.");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- testLabelsAttr("testHidden", null);
-}, "Check if the hidden input element can access 'labels'");
</del><ins>+ var hiddenInput = document.getElementById("testHidden");
+ assert_equals(hiddenInput.labels, null, "input[type=hidden] must have null .labels");
</ins><span class="cx">
</span><ins>+ this.add_cleanup(function () {
+ hiddenInput.type = "hidden";
+ });
+
+ hiddenInput.type = "text";
+ testLabelsAttr("testHidden", "lbl5");
+ var labels = hiddenInput.labels;
+
+ hiddenInput.type = "hidden";
+ assert_equals(labels.length, 0, "Retained .labels NodeList should be empty after input type changed to hidden");
+
+ hiddenInput.type = "checkbox";
+ assert_true(labels === hiddenInput.labels, ".labels property must return the [SameObject] after input type is toggled back from 'hidden'");
+ assert_equals(hiddenInput.labels.length, 1, ".labels NodeList should contain the input after the input type is changed from 'hidden' to 'checkbox'");
+}, "Check if the hidden input element has null 'labels'");
+
</ins><span class="cx"> test(function() {
</span><span class="cx"> assert_equals(document.getElementById("lbl6").control.id, "testRadio", "An input element in radio state should be labelable.");
</span><span class="cx"> }, "Check if the input element in radio state is a labelable element");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/Source/WebCore/ChangeLog 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-16 Chris Dumez <cdumez@apple.com>
+
+ <input>.labels is empty if type changes from text->hidden->checkbox
+ https://bugs.webkit.org/show_bug.cgi?id=168358
+
+ Reviewed by Ryosuke Niwa.
+
+ We were invalidating LabelsNodeLists on 'for' attribute change.
+ We now also invalidate them of 'type' attribute change since
+ HTMLInputElements whose type is 'hidden' do not support labels.
+
+ No new tests, updated existing test.
+
+ * dom/Document.h:
+ * dom/LiveNodeList.h:
+ (WebCore::shouldInvalidateTypeOnAttributeChange):
+ * html/LabelsNodeList.cpp:
+ (WebCore::LabelsNodeList::LabelsNodeList):
+
</ins><span class="cx"> 2017-02-16 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove even more EFL from WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/Source/WebCore/dom/Document.h 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> InvalidateOnClassAttrChange,
</span><span class="cx"> InvalidateOnIdNameAttrChange,
</span><span class="cx"> InvalidateOnNameAttrChange,
</span><del>- InvalidateOnForAttrChange,
</del><ins>+ InvalidateOnForTypeAttrChange,
</ins><span class="cx"> InvalidateForFormControls,
</span><span class="cx"> InvalidateOnHRefAttrChange,
</span><span class="cx"> InvalidateOnAnyAttrChange,
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.h (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.h 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/Source/WebCore/dom/LiveNodeList.h 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -113,8 +113,8 @@
</span><span class="cx"> return attrName == HTMLNames::nameAttr;
</span><span class="cx"> case InvalidateOnIdNameAttrChange:
</span><span class="cx"> return attrName == HTMLNames::idAttr || attrName == HTMLNames::nameAttr;
</span><del>- case InvalidateOnForAttrChange:
- return attrName == HTMLNames::forAttr;
</del><ins>+ case InvalidateOnForTypeAttrChange:
+ return attrName == HTMLNames::forAttr || attrName == HTMLNames::typeAttr;
</ins><span class="cx"> case InvalidateForFormControls:
</span><span class="cx"> return attrName == HTMLNames::nameAttr || attrName == HTMLNames::idAttr || attrName == HTMLNames::forAttr
</span><span class="cx"> || attrName == HTMLNames::formAttr || attrName == HTMLNames::typeAttr;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelsNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelsNodeList.cpp (212521 => 212522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.cpp 2017-02-17 04:07:12 UTC (rev 212521)
+++ trunk/Source/WebCore/html/LabelsNodeList.cpp 2017-02-17 04:30:45 UTC (rev 212522)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> LabelsNodeList::LabelsNodeList(LabelableElement& forNode)
</span><del>- : CachedLiveNodeList(forNode, InvalidateOnForAttrChange)
</del><ins>+ : CachedLiveNodeList(forNode, InvalidateOnForTypeAttrChange)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>