<!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>[212027] 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/212027">212027</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 18:17:05 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Details element doesn't work correctly when mutating content between closing and opening
https://bugs.webkit.org/show_bug.cgi?id=167310
Patch by Antti Koivisto <antti@apple.com> on 2017-02-09
Reviewed by Ryosuke Niwa.
Source/WebCore:
Tests: fast/html/details-close-modify-open.html
fast/shadow-dom/slot-remove-mutate-add.html
* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::didChangeSlot):
Always reset the slot assignment when content is mutated.
LayoutTests:
* fast/html/details-close-modify-open-expected.html: Added.
* fast/html/details-close-modify-open.html: Added.
* fast/shadow-dom/slot-remove-mutate-add-expected.html: Added.
* fast/shadow-dom/slot-remove-mutate-add.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="#trunkSourceWebCoredomSlotAssignmentcpp">trunk/Source/WebCore/dom/SlotAssignment.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthtmldetailsclosemodifyopenexpectedhtml">trunk/LayoutTests/fast/html/details-close-modify-open-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasthtmldetailsclosemodifyopenhtml">trunk/LayoutTests/fast/html/details-close-modify-open.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomslotremovemutateaddexpectedhtml">trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomslotremovemutateaddhtml">trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212026 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-10 02:15:02 UTC (rev 212026)
+++ trunk/LayoutTests/ChangeLog 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Details element doesn't work correctly when mutating content between closing and opening
+ https://bugs.webkit.org/show_bug.cgi?id=167310
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/html/details-close-modify-open-expected.html: Added.
+ * fast/html/details-close-modify-open.html: Added.
+ * fast/shadow-dom/slot-remove-mutate-add-expected.html: Added.
+ * fast/shadow-dom/slot-remove-mutate-add.html: Added.
+
</ins><span class="cx"> 2017-02-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash under FormSubmission::create()
</span></span></pre></div>
<a id="trunkLayoutTestsfasthtmldetailsclosemodifyopenexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/html/details-close-modify-open-expected.html (0 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/details-close-modify-open-expected.html (rev 0)
+++ trunk/LayoutTests/fast/html/details-close-modify-open-expected.html 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+<details open>
+foo
+</details>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthtmldetailsclosemodifyopenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/html/details-close-modify-open.html (0 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/details-close-modify-open.html (rev 0)
+++ trunk/LayoutTests/fast/html/details-close-modify-open.html 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<script>
+function go() {
+ d.open = false;
+ d.innerHTML = "foo";
+ d.open = true;
+}
+</script>
+<body onload=go()>
+<details id="d" open="true">
+<div></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotremovemutateaddexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add-expected.html (0 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add-expected.html 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+foo
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotremovemutateaddhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add.html (0 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-remove-mutate-add.html 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<body>
+<div id="d"><div></div></div>
+<script>
+const shadow = d.attachShadow({mode:"open"});
+shadow.innerHTML = `<slot></slot>`;
+d.offsetWidth;
+shadow.innerHTML = ``;
+d.innerHTML = "foo";
+shadow.innerHTML = `<slot></slot>`;
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212026 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-10 02:15:02 UTC (rev 212026)
+++ trunk/Source/WebCore/ChangeLog 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Details element doesn't work correctly when mutating content between closing and opening
+ https://bugs.webkit.org/show_bug.cgi?id=167310
+
+ Reviewed by Ryosuke Niwa.
+
+ Tests: fast/html/details-close-modify-open.html
+ fast/shadow-dom/slot-remove-mutate-add.html
+
+ * dom/SlotAssignment.cpp:
+ (WebCore::SlotAssignment::didChangeSlot):
+
+ Always reset the slot assignment when content is mutated.
+
</ins><span class="cx"> 2017-02-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash under FormSubmission::create()
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (212026 => 212027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp 2017-02-10 02:15:02 UTC (rev 212026)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2017-02-10 02:17:05 UTC (rev 212027)
</span><span class="lines">@@ -133,6 +133,9 @@
</span><span class="cx"> auto it = m_slots.find(slotName);
</span><span class="cx"> if (it == m_slots.end())
</span><span class="cx"> return;
</span><ins>+
+ it->value->assignedNodes.clear();
+ m_slotAssignmentsIsValid = false;
</ins><span class="cx">
</span><span class="cx"> HTMLSlotElement* slotElement = findFirstSlotElement(*it->value, shadowRoot);
</span><span class="cx"> if (!slotElement)
</span><span class="lines">@@ -139,7 +142,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> shadowRoot.host()->invalidateStyleAndRenderersForSubtree();
</span><del>- m_slotAssignmentsIsValid = false;
</del><span class="cx">
</span><span class="cx"> if (shadowRoot.mode() == ShadowRootMode::UserAgent)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>