<!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>[204186] 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/204186">204186</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-08-05 12:38:18 -0700 (Fri, 05 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>validity assertion fails after removing a child of an <optgroup> element
https://bugs.webkit.org/show_bug.cgi?id=155720
<rdar://problem/27720746>
Reviewed by Brent Fulgham.
Source/WebCore:
All calls to HTMLSelectElement::setRecalcListItems also need to call HTMLSelectElement::updateValidity.
Test: fast/dom/HTMLSelectElement/select-remove-from-optgroup.html
* html/HTMLOptGroupElement.cpp:
(WebCore::HTMLOptGroupElement::recalcSelectOptions): Call 'updateValidity' after 'setRecalcListItems'.
* html/HTMLOptionElement.cpp:
(WebCore::HTMLOptionElement::insertedInto): Ditto.
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::parseAttribute): Ditto.
LayoutTests:
Add new test case that triggers a debug assertion when the HTMLSelectElement state
is not updated properly.
* fast/dom/HTMLSelectElement/select-remove-from-optgroup-expected.txt: Added.
* fast/dom/HTMLSelectElement/select-remove-from-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="#trunkSourceWebCorehtmlHTMLOptGroupElementcpp">trunk/Source/WebCore/html/HTMLOptGroupElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionElementcpp">trunk/Source/WebCore/html/HTMLOptionElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementselectremovefromoptgroupexpectedtxt">trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementselectremovefromoptgrouphtml">trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204185 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-05 19:29:55 UTC (rev 204185)
+++ trunk/LayoutTests/ChangeLog 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-08-05 Brent Fulgham <bfulgham@apple.com>
+
+ validity assertion fails after removing a child of an <optgroup> element
+ https://bugs.webkit.org/show_bug.cgi?id=155720
+ <rdar://problem/27720746>
+
+ Reviewed by Brent Fulgham.
+
+ Add new test case that triggers a debug assertion when the HTMLSelectElement state
+ is not updated properly.
+
+ * fast/dom/HTMLSelectElement/select-remove-from-optgroup-expected.txt: Added.
+ * fast/dom/HTMLSelectElement/select-remove-from-optgroup.html: Added.
+
</ins><span class="cx"> 2016-08-05 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r204174.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementselectremovefromoptgroupexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup-expected.txt (0 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup-expected.txt 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementselectremovefromoptgrouphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup.html (0 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/select-remove-from-optgroup.html 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<script>
+window.onload = function() {
+ var parent = document.getElementById('id_1');
+ parent.removeChild(parent.childNodes[0]);
+ parent.removeChild(parent.childNodes[0]);
+ document.getElementById('id_0').appendChild(document.activeElement);
+}
+</script>
+<template id="id_0"></template>
+<select required>
+ <optgroup id="id_1">
+ <option></option>
+ </optgroup>
+</select>
+The test passes if this does not cause a debug assert.
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204185 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-05 19:29:55 UTC (rev 204185)
+++ trunk/Source/WebCore/ChangeLog 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-08-05 Brent Fulgham <bfulgham@apple.com>
+
+ validity assertion fails after removing a child of an <optgroup> element
+ https://bugs.webkit.org/show_bug.cgi?id=155720
+ <rdar://problem/27720746>
+
+ Reviewed by Brent Fulgham.
+
+ All calls to HTMLSelectElement::setRecalcListItems also need to call HTMLSelectElement::updateValidity.
+
+ Test: fast/dom/HTMLSelectElement/select-remove-from-optgroup.html
+
+ * html/HTMLOptGroupElement.cpp:
+ (WebCore::HTMLOptGroupElement::recalcSelectOptions): Call 'updateValidity' after 'setRecalcListItems'.
+ * html/HTMLOptionElement.cpp:
+ (WebCore::HTMLOptionElement::insertedInto): Ditto.
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::parseAttribute): Ditto.
+
</ins><span class="cx"> 2016-08-05 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r204174.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptGroupElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptGroupElement.cpp (204185 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptGroupElement.cpp 2016-08-05 19:29:55 UTC (rev 204185)
+++ trunk/Source/WebCore/html/HTMLOptGroupElement.cpp 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "HTMLOptGroupElement.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "ElementAncestorIterator.h"
</ins><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLSelectElement.h"
</span><span class="cx"> #include "RenderMenuList.h"
</span><span class="lines">@@ -85,11 +86,10 @@
</span><span class="cx">
</span><span class="cx"> void HTMLOptGroupElement::recalcSelectOptions()
</span><span class="cx"> {
</span><del>- ContainerNode* select = parentNode();
- while (select && !is<HTMLSelectElement>(*select))
- select = select->parentNode();
- if (select)
- downcast<HTMLSelectElement>(*select).setRecalcListItems();
</del><ins>+ if (auto* selectElement = ancestorsOfType<HTMLSelectElement>(*this).first()) {
+ selectElement->setRecalcListItems();
+ selectElement->updateValidity();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String HTMLOptGroupElement::groupLabelText() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionElement.cpp (204185 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionElement.cpp 2016-08-05 19:29:55 UTC (rev 204185)
+++ trunk/Source/WebCore/html/HTMLOptionElement.cpp 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -316,6 +316,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (HTMLSelectElement* select = ownerSelectElement()) {
</span><span class="cx"> select->setRecalcListItems();
</span><ins>+ select->updateValidity();
</ins><span class="cx"> // Do not call selected() since calling updateListItemSelectedStates()
</span><span class="cx"> // at this time won't do the right thing. (Why, exactly?)
</span><span class="cx"> // FIXME: Might be better to call this unconditionally, always passing m_isSelected,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (204185 => 204186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-08-05 19:29:55 UTC (rev 204185)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2016-08-05 19:38:18 UTC (rev 204186)
</span><span class="lines">@@ -305,6 +305,7 @@
</span><span class="cx"> if (m_size != oldSize) {
</span><span class="cx"> setNeedsStyleRecalc(ReconstructRenderTree);
</span><span class="cx"> setRecalcListItems();
</span><ins>+ updateValidity();
</ins><span class="cx"> }
</span><span class="cx"> } else if (name == multipleAttr)
</span><span class="cx"> parseMultipleAttribute(value);
</span></span></pre>
</div>
</div>
</body>
</html>