<!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>[207276] 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/207276">207276</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 21:13:49 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements
https://bugs.webkit.org/show_bug.cgi?id=163358
Reviewed by Kent Tamura.
Source/WebCore:
Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements.
As per the specification, we only want optgroup elements that are direct
children of the select element. This also matches the behavior of Chrome.
Test: fast/dom/HTMLSelectElement/nested-optgroup.html
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::recalcListItems):
LayoutTests:
Add layout test coverage.
* fast/dom/HTMLSelectElement/nested-optgroup-expected.txt: Added.
* fast/dom/HTMLSelectElement/nested-optgroup.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementnestedoptgroupexpectedtxt">trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementnestedoptgrouphtml">trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207275 => 207276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-13 03:48:54 UTC (rev 207275)
+++ trunk/LayoutTests/ChangeLog 2016-10-13 04:13:49 UTC (rev 207276)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-12 Chris Dumez <cdumez@apple.com>
+
+ Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements
+ https://bugs.webkit.org/show_bug.cgi?id=163358
+
+ Reviewed by Kent Tamura.
+
+ Add layout test coverage.
+
+ * fast/dom/HTMLSelectElement/nested-optgroup-expected.txt: Added.
+ * fast/dom/HTMLSelectElement/nested-optgroup.html: Added.
+
</ins><span class="cx"> 2016-10-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderRubyRun should not mark child renderers dirty at the end of layout.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementnestedoptgroupexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup-expected.txt (0 => 207276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup-expected.txt 2016-10-13 04:13:49 UTC (rev 207276)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test that options in nested optgroup elements cannot be selected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS select.value is "PASS"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementnestedoptgrouphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup.html (0 => 207276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup.html 2016-10-13 04:13:49 UTC (rev 207276)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<select id="testSelect">
+ <option>FAIL</option>
+ <optgroup id="topGroup" label="Top group"></optgroup>
+ <option>PASS</option>
+</select>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+description("Test that options in nested optgroup elements cannot be selected.");
+
+var select = document.getElementById("testSelect");
+var topgroup = document.getElementById("topGroup");
+
+var nestedGroup = document.createElement("optgroup");
+nestedGroup.label = "Nested group";
+var option = document.createElement("option");
+option.appendChild(document.createTextNode("FAIL"));
+nestedGroup.appendChild(option);
+topGroup.appendChild(nestedGroup);
+
+select.selectedIndex = 1;
+shouldBeEqualToString("select.value", "PASS");
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207275 => 207276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 03:48:54 UTC (rev 207275)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 04:13:49 UTC (rev 207276)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-12 Chris Dumez <cdumez@apple.com>
+
+ Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements
+ https://bugs.webkit.org/show_bug.cgi?id=163358
+
+ Reviewed by Kent Tamura.
+
+ Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements.
+ As per the specification, we only want optgroup elements that are direct
+ children of the select element. This also matches the behavior of Chrome.
+
+ Test: fast/dom/HTMLSelectElement/nested-optgroup.html
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::recalcListItems):
+
</ins><span class="cx"> 2016-10-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderRubyRun should not mark child renderers dirty at the end of layout.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (207275 => 207276)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-10-13 03:48:54 UTC (rev 207275)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-10-13 04:13:49 UTC (rev 207276)
</span><span class="lines">@@ -770,10 +770,8 @@
</span><span class="cx"> }
</span><span class="cx"> HTMLElement& current = downcast<HTMLElement>(*currentElement);
</span><span class="cx">
</span><del>- // optgroup tags may not nest. However, both FireFox and IE will
- // flatten the tree automatically, so we follow suit.
- // (http://www.w3.org/TR/html401/interact/forms.html#h-17.6)
- if (is<HTMLOptGroupElement>(current)) {
</del><ins>+ // Only consider optgroup elements that are direct children of the select element.
+ if (is<HTMLOptGroupElement>(current) && current.parentNode() == this) {
</ins><span class="cx"> m_listItems.append(&current);
</span><span class="cx"> if (Element* nextElement = ElementTraversal::firstWithin(current)) {
</span><span class="cx"> currentElement = nextElement;
</span></span></pre>
</div>
</div>
</body>
</html>