<!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>[164407] 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/164407">164407</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-19 18:08:30 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fieldset:disabled fieldset > legend:first-child input should be disabled
https://bugs.webkit.org/show_bug.cgi?id=129077
Reviewed by Antti Koivisto.
Source/WebCore:
Similar to <a href="http://trac.webkit.org/projects/webkit/changeset/164403">r164403</a>. When a fieldset inside a disabled fieldset, input elements inside
the inner fieldset's first legend element child should be disabled.
Test: fast/forms/fieldset/fieldset-disabled-2.html
* html/HTMLFieldSetElement.cpp:
(WebCore::HTMLFieldSetElement::legend): Fixed the bug where it was returning the first
legend element descendent. It should be the first legend element _child_.
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::updateAncestorDisabledState): Fixed the algorithm
to look for any ancestor fieldset that has been disabled instead of the first fieldset
ancestor and checking its disabledness.
LayoutTests:
Added a test case.o
* fast/forms/fieldset/fieldset-disabled-2-expected.txt:
* fast/forms/fieldset/fieldset-disabled-2.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformsfieldsetfieldsetdisabled2expectedtxt">trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsfieldsetfieldsetdisabled2html">trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementcpp">trunk/Source/WebCore/html/HTMLFieldSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164406 => 164407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-20 02:03:40 UTC (rev 164406)
+++ trunk/LayoutTests/ChangeLog 2014-02-20 02:08:30 UTC (rev 164407)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-02-19 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ fieldset:disabled fieldset > legend:first-child input should be disabled
+ https://bugs.webkit.org/show_bug.cgi?id=129077
+
+ Reviewed by Antti Koivisto.
+
+ Added a test case.o
+
+ * fast/forms/fieldset/fieldset-disabled-2-expected.txt:
+ * fast/forms/fieldset/fieldset-disabled-2.html:
+
+2014-02-19 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> fieldset:disabled > legend:first-child legend input should not be disabled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129068
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsfieldsetfieldsetdisabled2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2-expected.txt (164406 => 164407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2-expected.txt 2014-02-20 02:03:40 UTC (rev 164406)
+++ trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2-expected.txt 2014-02-20 02:08:30 UTC (rev 164407)
</span><span class="lines">@@ -7,12 +7,14 @@
</span><span class="cx"> PASS isInputDisabledById("inputInsideFirstLegend") is false
</span><span class="cx"> PASS isInputDisabledById("inputInsideSecondLegend") is true
</span><span class="cx"> PASS isInputDisabledById("inputInsideNestedFirstLegend") is false
</span><ins>+PASS isInputDisabledById("inputInsideFirstLegendWithDisabledOuterFieldset") is true
</ins><span class="cx">
</span><span class="cx"> setDisabledOnAllFieldsets(false)
</span><span class="cx"> PASS isInputDisabledById("inputOutsideLegend") is false
</span><span class="cx"> PASS isInputDisabledById("inputInsideFirstLegend") is false
</span><span class="cx"> PASS isInputDisabledById("inputInsideSecondLegend") is false
</span><span class="cx"> PASS isInputDisabledById("inputInsideNestedFirstLegend") is false
</span><ins>+PASS isInputDisabledById("inputInsideFirstLegendWithDisabledOuterFieldset") is false
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsfieldsetfieldsetdisabled2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2.html (164406 => 164407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2.html 2014-02-20 02:03:40 UTC (rev 164406)
+++ trunk/LayoutTests/fast/forms/fieldset/fieldset-disabled-2.html 2014-02-20 02:08:30 UTC (rev 164407)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> <fieldset disabled><legend><input id="inputInsideFirstLegend"></legend></fieldset>
</span><span class="cx"> <fieldset disabled><legend></legend><legend><input id="inputInsideSecondLegend"></legend></fieldset>
</span><span class="cx"> <fieldset disabled><legend><legend><input id="inputInsideNestedFirstLegend"></legend></legend></fieldset>
</span><ins>+<fieldset disabled><fieldset><legend><input id="inputInsideFirstLegendWithDisabledOuterFieldset"></legend></fieldset></fieldset>
</ins><span class="cx"> </div>
</span><span class="cx"> <script>
</span><span class="cx">
</span><span class="lines">@@ -26,6 +27,7 @@
</span><span class="cx"> shouldBeFalse('isInputDisabledById("inputInsideFirstLegend")');
</span><span class="cx"> shouldBeTrue('isInputDisabledById("inputInsideSecondLegend")');
</span><span class="cx"> shouldBeFalse('isInputDisabledById("inputInsideNestedFirstLegend")');
</span><ins>+shouldBeTrue('isInputDisabledById("inputInsideFirstLegendWithDisabledOuterFieldset")');
</ins><span class="cx">
</span><span class="cx"> function setDisabledOnAllFieldsets(value) {
</span><span class="cx"> var fieldsets = document.querySelectorAll('fieldset');
</span><span class="lines">@@ -39,6 +41,7 @@
</span><span class="cx"> shouldBeFalse('isInputDisabledById("inputInsideFirstLegend")');
</span><span class="cx"> shouldBeFalse('isInputDisabledById("inputInsideSecondLegend")');
</span><span class="cx"> shouldBeFalse('isInputDisabledById("inputInsideNestedFirstLegend")');
</span><ins>+shouldBeFalse('isInputDisabledById("inputInsideFirstLegendWithDisabledOuterFieldset")');
</ins><span class="cx">
</span><span class="cx"> document.getElementById('container').style.display = 'none';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164406 => 164407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 02:03:40 UTC (rev 164406)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 02:08:30 UTC (rev 164407)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-02-19 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ fieldset:disabled fieldset > legend:first-child input should be disabled
+ https://bugs.webkit.org/show_bug.cgi?id=129077
+
+ Reviewed by Antti Koivisto.
+
+ Similar to r164403. When a fieldset inside a disabled fieldset, input elements inside
+ the inner fieldset's first legend element child should be disabled.
+
+ Test: fast/forms/fieldset/fieldset-disabled-2.html
+
+ * html/HTMLFieldSetElement.cpp:
+ (WebCore::HTMLFieldSetElement::legend): Fixed the bug where it was returning the first
+ legend element descendent. It should be the first legend element _child_.
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::updateAncestorDisabledState): Fixed the algorithm
+ to look for any ancestor fieldset that has been disabled instead of the first fieldset
+ ancestor and checking its disabledness.
+
+2014-02-19 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Debug build fix after r164401. Removed a bogus assertion in comparePositions.
</span><span class="cx"> When either position is anchored at a detached node, they don't have a tree scope in common.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.cpp (164406 => 164407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-02-20 02:03:40 UTC (rev 164406)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2014-02-20 02:08:30 UTC (rev 164407)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> HTMLLegendElement* HTMLFieldSetElement::legend() const
</span><span class="cx"> {
</span><del>- return const_cast<HTMLLegendElement*>(descendantsOfType<HTMLLegendElement>(*this).first());
</del><ins>+ return const_cast<HTMLLegendElement*>(childrenOfType<HTMLLegendElement>(*this).first());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<HTMLCollection> HTMLFieldSetElement::elements()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (164406 => 164407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-02-20 02:03:40 UTC (rev 164406)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-02-20 02:08:30 UTC (rev 164407)
</span><span class="lines">@@ -103,10 +103,10 @@
</span><span class="cx"> {
</span><span class="cx"> Element* previousAncestor = nullptr;
</span><span class="cx"> for (Element* ancestor = parentElement(); ancestor; ancestor = ancestor->parentElement()) {
</span><del>- if (isHTMLFieldSetElement(ancestor)) {
</del><ins>+ if (isHTMLFieldSetElement(ancestor) && ancestor->hasAttribute(disabledAttr)) {
</ins><span class="cx"> HTMLFieldSetElement& fieldSetAncestor = toHTMLFieldSetElement(*ancestor);
</span><span class="cx"> bool isInFirstLegend = previousAncestor && isHTMLLegendElement(previousAncestor) && previousAncestor == fieldSetAncestor.legend();
</span><del>- m_ancestorDisabledState = !fieldSetAncestor.isDisabledFormControl() || isInFirstLegend ? AncestorDisabledStateEnabled : AncestorDisabledStateDisabled;
</del><ins>+ m_ancestorDisabledState = isInFirstLegend ? AncestorDisabledStateEnabled : AncestorDisabledStateDisabled;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> previousAncestor = ancestor;
</span></span></pre>
</div>
</div>
</body>
</html>