<!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>[281128] 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/281128">281128</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2021-08-16 22:34:02 -0700 (Mon, 16 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/275756">r275756</a>): Accelerated animations freeze when invalidating layout with shadow dom
https://bugs.webkit.org/show_bug.cgi?id=228954
<rdar://problem/81750217>

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: animations/shadow-host-child-change.html

Tearing down the host renderer after slot assignments change cancels animations on it.

* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::didChangeSlot):
* rendering/updating/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::tearDownRenderersAfterSlotChange):

Add a version that keeps the animations going on the teardown root.

(WebCore::RenderTreeUpdater::tearDownRenderers):
* rendering/updating/RenderTreeUpdater.h:

LayoutTests:

Original test by Liam DeBeasi

* animations/shadow-host-child-change-expected.html: Added.
* animations/shadow-host-child-change.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>
<li><a href="#trunkSourceWebCorerenderingupdatingRenderTreeUpdatercpp">trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingupdatingRenderTreeUpdaterh">trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsshadowhostchildchangeexpectedhtml">trunk/LayoutTests/animations/shadow-host-child-change-expected.html</a></li>
<li><a href="#trunkLayoutTestsanimationsshadowhostchildchangehtml">trunk/LayoutTests/animations/shadow-host-child-change.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281127 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-08-17 04:52:06 UTC (rev 281127)
+++ trunk/LayoutTests/ChangeLog 2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-08-16  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r275756): Accelerated animations freeze when invalidating layout with shadow dom
+        https://bugs.webkit.org/show_bug.cgi?id=228954
+        <rdar://problem/81750217>
+
+        Reviewed by Ryosuke Niwa.
+
+        Original test by Liam DeBeasi
+
+        * animations/shadow-host-child-change-expected.html: Added.
+        * animations/shadow-host-child-change.html: Added.
+
</ins><span class="cx"> 2021-08-16  Dean Jackson  <dino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebXR contexts have to use high-power GPUs
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsshadowhostchildchangeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/shadow-host-child-change-expected.html (0 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/shadow-host-child-change-expected.html                              (rev 0)
+++ trunk/LayoutTests/animations/shadow-host-child-change-expected.html 2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+
+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            app-content {
+                display: block;
+                width: 100px;
+                height: 100px;
+                background: green;
+                transform: translateX(100px);
+            }
+        </style>
+    </head>
+    <body>
+        <app-content id=target>new text</app-content>
+    </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsanimationsshadowhostchildchangehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/shadow-host-child-change.html (0 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/shadow-host-child-change.html                               (rev 0)
+++ trunk/LayoutTests/animations/shadow-host-child-change.html  2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+
+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            app-content {
+                display: block;
+                width: 100px;
+                height: 100px;
+                background: green;
+                animation: animation 10s linear forwards;
+            }
+            @keyframes animation {
+                from {
+                    transform: translateX(0px);
+                }
+                2% {
+                    transform: translateX(100px);
+                }
+                to {
+                    transform: translateX(100px);
+                }
+            }
+        </style>
+    </head>
+    <body>
+        <app-content id=target>old text</app-content>
+
+        <script>
+            if (window.testRunner)
+                testRunner.waitUntilDone();
+
+            customElements.define('app-content', class extends HTMLElement {
+                constructor() {
+                    super();
+
+                    const root = this.attachShadow({ mode: 'open' });
+                    root.innerHTML = `<slot></slot>`;
+                }
+            });
+
+            setTimeout(() => {
+                target.innerHTML = "new text"
+            }, 100);
+
+            if (window.testRunner)
+                setTimeout(() => testRunner.notifyDone(), 500);
+        </script>
+    </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281127 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-17 04:52:06 UTC (rev 281127)
+++ trunk/Source/WebCore/ChangeLog      2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-08-16  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r275756): Accelerated animations freeze when invalidating layout with shadow dom
+        https://bugs.webkit.org/show_bug.cgi?id=228954
+        <rdar://problem/81750217>
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: animations/shadow-host-child-change.html
+
+        Tearing down the host renderer after slot assignments change cancels animations on it.
+
+        * dom/SlotAssignment.cpp:
+        (WebCore::SlotAssignment::didChangeSlot):
+        * rendering/updating/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::tearDownRenderersAfterSlotChange):
+
+        Add a version that keeps the animations going on the teardown root.
+
+        (WebCore::RenderTreeUpdater::tearDownRenderers):
+        * rendering/updating/RenderTreeUpdater.h:
+
</ins><span class="cx"> 2021-08-16  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Share CanShare() should be called after transient activation check
</span></span></pre></div>
<a id="trunkSourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SlotAssignment.cpp (281127 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SlotAssignment.cpp      2021-08-17 04:52:06 UTC (rev 281127)
+++ trunk/Source/WebCore/dom/SlotAssignment.cpp 2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -307,8 +307,8 @@
</span><span class="cx">     if (!slot)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    RenderTreeUpdater::tearDownRenderers(*shadowRoot.host());
-    shadowRoot.host()->invalidateStyleAndRenderersForSubtree();
</del><ins>+    RenderTreeUpdater::tearDownRenderersAfterSlotChange(*shadowRoot.host());
+    shadowRoot.host()->invalidateStyleForSubtree();
</ins><span class="cx"> 
</span><span class="cx">     slot->assignedNodes.clear();
</span><span class="cx">     m_slotAssignmentsIsValid = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingupdatingRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp (281127 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp    2021-08-17 04:52:06 UTC (rev 281127)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp       2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -536,6 +536,16 @@
</span><span class="cx">     tearDownRenderers(root, TeardownType::Full, builder);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RenderTreeUpdater::tearDownRenderersAfterSlotChange(Element& host)
+{
+    ASSERT(host.shadowRoot());
+    auto* view = host.document().renderView();
+    if (!view)
+        return;
+    RenderTreeBuilder builder(*view);
+    tearDownRenderers(host, TeardownType::FullAfterSlotChange, builder);
+}
+
</ins><span class="cx"> void RenderTreeUpdater::tearDownRenderer(Text& text)
</span><span class="cx"> {
</span><span class="cx">     auto* view = text.document().renderView();
</span><span class="lines">@@ -560,6 +570,7 @@
</span><span class="cx">     auto pop = [&] (unsigned depth) {
</span><span class="cx">         while (teardownStack.size() > depth) {
</span><span class="cx">             auto& element = *teardownStack.takeLast();
</span><ins>+            auto styleable = Styleable::fromElement(element);
</ins><span class="cx"> 
</span><span class="cx">             // Make sure we don't leave any renderers behind in nodes outside the composed tree.
</span><span class="cx">             if (element.shadowRoot())
</span><span class="lines">@@ -566,19 +577,26 @@
</span><span class="cx">                 tearDownLeftoverShadowHostChildren(element, builder);
</span><span class="cx"> 
</span><span class="cx">             switch (teardownType) {
</span><ins>+            case TeardownType::FullAfterSlotChange:
+                if (&element == &root) {
+                    // Keep animations going on the host.
+                    styleable.willChangeRenderer();
+                    break;
+                }
+                FALLTHROUGH;
</ins><span class="cx">             case TeardownType::Full:
</span><ins>+                if (document.renderTreeBeingDestroyed())
+                    styleable.cancelDeclarativeAnimations();
+                element.clearHoverAndActiveStatusBeforeDetachingRenderer();
+                break;
</ins><span class="cx">             case TeardownType::RendererUpdateCancelingAnimations:
</span><del>-                if (document.renderTreeBeingDestroyed() || teardownType == TeardownType::RendererUpdateCancelingAnimations)
-                    Styleable::fromElement(element).cancelDeclarativeAnimations();
</del><ins>+                styleable.cancelDeclarativeAnimations();
</ins><span class="cx">                 break;
</span><span class="cx">             case TeardownType::RendererUpdate:
</span><del>-                Styleable::fromElement(element).willChangeRenderer();
</del><ins>+                styleable.willChangeRenderer();
</ins><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            if (teardownType == TeardownType::Full)
-                element.clearHoverAndActiveStatusBeforeDetachingRenderer();
-
</del><span class="cx">             GeneratedContent::removeBeforePseudoElement(element, builder);
</span><span class="cx">             GeneratedContent::removeAfterPseudoElement(element, builder);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingupdatingRenderTreeUpdaterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.h (281127 => 281128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.h      2021-08-17 04:52:06 UTC (rev 281127)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.h 2021-08-17 05:34:02 UTC (rev 281128)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx">     void commit(std::unique_ptr<const Style::Update>);
</span><span class="cx"> 
</span><span class="cx">     static void tearDownRenderers(Element&);
</span><ins>+    static void tearDownRenderersAfterSlotChange(Element& host);
</ins><span class="cx">     static void tearDownRenderer(Text&);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="lines">@@ -86,7 +87,8 @@
</span><span class="cx">     void popParent();
</span><span class="cx">     void popParentsToDepth(unsigned depth);
</span><span class="cx"> 
</span><del>-    enum class TeardownType { Full, RendererUpdate, RendererUpdateCancelingAnimations };
</del><ins>+    // FIXME: Use OptionSet.
+    enum class TeardownType { Full, FullAfterSlotChange, RendererUpdate, RendererUpdateCancelingAnimations };
</ins><span class="cx">     static void tearDownRenderers(Element&, TeardownType, RenderTreeBuilder&);
</span><span class="cx">     static void tearDownTextRenderer(Text&, RenderTreeBuilder&);
</span><span class="cx">     static void tearDownLeftoverShadowHostChildren(Element&, RenderTreeBuilder&);
</span></span></pre>
</div>
</div>

</body>
</html>