<!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>[277377] branches/safari-611-branch</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/277377">277377</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-05-12 10:54:07 -0700 (Wed, 12 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/277373">r277373</a>. rdar://problem/77916543

    Source/WebCore:
    REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree
    in Element::insertedIntoAncestor
    https://bugs.webkit.org/show_bug.cgi?id=225684

    Reviewed by Darin Adler.

    The release assertion failure was caused by RenderTreeUpdater::tearDownRenderers end up traversing the parts of the DOM
    for which Element::insertedIntoAncestor had not been called yet. Since HTMLSlotElement::insertedIntoAncestor is where
    SlotAssignment::Slot is updated for a newly inserted slot, SlotAssignment::Slot may not contain this slot element.

    Fixed the bug by returning early in SlotAssignment::assignedNodesForSlot when this condition holds, which is when
    the shadow root is connected to a document but HTMLSlotElement isn't since its connected flag has not been updated yet.

    Test: fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html

    * dom/SlotAssignment.cpp:
    (WebCore::SlotAssignment::assignedNodesForSlot):

    LayoutTests:
    REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree in Element::insertedIntoAncestor
    https://bugs.webkit.org/show_bug.cgi?id=225684

    Reviewed by Darin Adler.

    Added a regression test.

    * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt: Added.
    * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277373 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari611branchLayoutTestsChangeLog">branches/safari-611-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari611branchSourceWebCoreChangeLog">branches/safari-611-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari611branchSourceWebCoredomSlotAssignmentcpp">branches/safari-611-branch/Source/WebCore/dom/SlotAssignment.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari611branchLayoutTestsfastshadowdominserthostchildwithslotrendererteardowncrashexpectedtxt">branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt</a></li>
<li><a href="#branchessafari611branchLayoutTestsfastshadowdominserthostchildwithslotrendererteardowncrashhtml">branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari611branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/LayoutTests/ChangeLog (277376 => 277377)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/LayoutTests/ChangeLog 2021-05-12 17:52:38 UTC (rev 277376)
+++ branches/safari-611-branch/LayoutTests/ChangeLog    2021-05-12 17:54:07 UTC (rev 277377)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2021-05-12  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r277373. rdar://problem/77916543
+
+    Source/WebCore:
+    REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree
+    in Element::insertedIntoAncestor
+    https://bugs.webkit.org/show_bug.cgi?id=225684
+    
+    Reviewed by Darin Adler.
+    
+    The release assertion failure was caused by RenderTreeUpdater::tearDownRenderers end up traversing the parts of the DOM
+    for which Element::insertedIntoAncestor had not been called yet. Since HTMLSlotElement::insertedIntoAncestor is where
+    SlotAssignment::Slot is updated for a newly inserted slot, SlotAssignment::Slot may not contain this slot element.
+    
+    Fixed the bug by returning early in SlotAssignment::assignedNodesForSlot when this condition holds, which is when
+    the shadow root is connected to a document but HTMLSlotElement isn't since its connected flag has not been updated yet.
+    
+    Test: fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html
+    
+    * dom/SlotAssignment.cpp:
+    (WebCore::SlotAssignment::assignedNodesForSlot):
+    
+    LayoutTests:
+    REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree in Element::insertedIntoAncestor
+    https://bugs.webkit.org/show_bug.cgi?id=225684
+    
+    Reviewed by Darin Adler.
+    
+    Added a regression test.
+    
+    * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt: Added.
+    * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277373 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-05-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+            REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree in Element::insertedIntoAncestor
+            https://bugs.webkit.org/show_bug.cgi?id=225684
+
+            Reviewed by Darin Adler.
+
+            Added a regression test.
+
+            * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt: Added.
+            * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html: Added.
+
</ins><span class="cx"> 2021-05-07  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r276739. rdar://problem/77581103
</span></span></pre></div>
<a id="branchessafari611branchLayoutTestsfastshadowdominserthostchildwithslotrendererteardowncrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt (0 => 277377)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt                          (rev 0)
+++ branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt     2021-05-12 17:54:07 UTC (rev 277377)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This tests if WebKit does not crash or hit any assertions.
+
+PASS
</ins></span></pre></div>
<a id="branchessafari611branchLayoutTestsfastshadowdominserthostchildwithslotrendererteardowncrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html (0 => 277377)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html                          (rev 0)
+++ branches/safari-611-branch/LayoutTests/fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html     2021-05-12 17:54:07 UTC (rev 277377)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests if WebKit does not crash or hit any assertions.</p>
+<script>
+
+if (window.testRunner)
+    testRunner.dumpAsText();
+
+const host = document.createElement('div');
+document.body.appendChild(host);
+const shadowRoot = host.attachShadow({mode: 'closed'});
+shadowRoot.innerHTML = '<div id="inner"><slot name="some-name"></slot></div>';
+
+const innerHost = shadowRoot.getElementById('inner');
+const innerShadowRoot = innerHost.attachShadow({mode: 'closed'});
+innerShadowRoot.appendChild(document.createElement('slot'));
+innerHost.getBoundingClientRect();
+
+shadowRoot.querySelector('slot').remove();
+const newChild = document.createElement('div');
+newChild.appendChild(document.createElement('slot'));
+innerHost.appendChild(newChild);
+
+document.write('<div>PASS</div>');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari611branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (277376 => 277377)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebCore/ChangeLog      2021-05-12 17:52:38 UTC (rev 277376)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-05-12 17:54:07 UTC (rev 277377)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2021-05-12  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r277373. rdar://problem/77916543
+
+    Source/WebCore:
+    REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree
+    in Element::insertedIntoAncestor
+    https://bugs.webkit.org/show_bug.cgi?id=225684
+    
+    Reviewed by Darin Adler.
+    
+    The release assertion failure was caused by RenderTreeUpdater::tearDownRenderers end up traversing the parts of the DOM
+    for which Element::insertedIntoAncestor had not been called yet. Since HTMLSlotElement::insertedIntoAncestor is where
+    SlotAssignment::Slot is updated for a newly inserted slot, SlotAssignment::Slot may not contain this slot element.
+    
+    Fixed the bug by returning early in SlotAssignment::assignedNodesForSlot when this condition holds, which is when
+    the shadow root is connected to a document but HTMLSlotElement isn't since its connected flag has not been updated yet.
+    
+    Test: fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html
+    
+    * dom/SlotAssignment.cpp:
+    (WebCore::SlotAssignment::assignedNodesForSlot):
+    
+    LayoutTests:
+    REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree in Element::insertedIntoAncestor
+    https://bugs.webkit.org/show_bug.cgi?id=225684
+    
+    Reviewed by Darin Adler.
+    
+    Added a regression test.
+    
+    * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash-expected.txt: Added.
+    * fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277373 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-05-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+            REGRESSION: Release assert in SlotAssignment::assignedNodesForSlot via ComposedTreeIterator::traverseNextInShadowTree
+            in Element::insertedIntoAncestor
+            https://bugs.webkit.org/show_bug.cgi?id=225684
+
+            Reviewed by Darin Adler.
+
+            The release assertion failure was caused by RenderTreeUpdater::tearDownRenderers end up traversing the parts of the DOM
+            for which Element::insertedIntoAncestor had not been called yet. Since HTMLSlotElement::insertedIntoAncestor is where
+            SlotAssignment::Slot is updated for a newly inserted slot, SlotAssignment::Slot may not contain this slot element.
+
+            Fixed the bug by returning early in SlotAssignment::assignedNodesForSlot when this condition holds, which is when
+            the shadow root is connected to a document but HTMLSlotElement isn't since its connected flag has not been updated yet.
+
+            Test: fast/shadow-dom/insert-host-child-with-slot-renderer-teardown-crash.html
+
+            * dom/SlotAssignment.cpp:
+            (WebCore::SlotAssignment::assignedNodesForSlot):
+
</ins><span class="cx"> 2021-05-07  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r276739. rdar://problem/77581103
</span></span></pre></div>
<a id="branchessafari611branchSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebCore/dom/SlotAssignment.cpp (277376 => 277377)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebCore/dom/SlotAssignment.cpp 2021-05-12 17:52:38 UTC (rev 277376)
+++ branches/safari-611-branch/Source/WebCore/dom/SlotAssignment.cpp    2021-05-12 17:54:07 UTC (rev 277377)
</span><span class="lines">@@ -332,6 +332,10 @@
</span><span class="cx">     ASSERT(slotElement.containingShadowRoot() == &shadowRoot);
</span><span class="cx">     const AtomString& slotName = slotNameFromAttributeValue(slotElement.attributeWithoutSynchronization(nameAttr));
</span><span class="cx">     auto* slot = m_slots.get(slotName);
</span><ins>+
+    bool hasNotCalledInsertedIntoAncestorOnSlot = shadowRoot.isConnected() && !slotElement.isConnected();
+    if (hasNotCalledInsertedIntoAncestorOnSlot)
+        return nullptr;
</ins><span class="cx">     RELEASE_ASSERT(slot);
</span><span class="cx"> 
</span><span class="cx">     if (!m_slotAssignmentsIsValid)
</span></span></pre>
</div>
</div>

</body>
</html>