<!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>[278610] 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/278610">278610</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-08 09:27:50 -0700 (Tue, 08 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/256095">r256095</a>): Adding a border-radius, border, or box-shadow breaks animations from scale(0)
https://bugs.webkit.org/show_bug.cgi?id=218371
<rdar://problem/70906316>

Reviewed by Simon Fraser.

Source/WebCore:

When computing an animation's transform extent, we must account for implicit keyframes.

Test: webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html

* animation/KeyframeEffect.cpp:
(WebCore::KeyframeEffect::computeExtentOfTransformAnimation const):

LayoutTests:

Add a test where we have an animation on an element with a a border and a transform animation to scale(0) where the
first keyframe is implicit. This test would fail prior to this patch.

* webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html: Added.
* webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.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="#trunkSourceWebCoreanimationKeyframeEffectcpp">trunk/Source/WebCore/animation/KeyframeEffect.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebanimationsacceleratedtransformanimationtoscalezerowithimplicitfromkeyframeexpectedhtml">trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html</a></li>
<li><a href="#trunkLayoutTestswebanimationsacceleratedtransformanimationtoscalezerowithimplicitfromkeyframehtml">trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278609 => 278610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-08 16:14:14 UTC (rev 278609)
+++ trunk/LayoutTests/ChangeLog 2021-06-08 16:27:50 UTC (rev 278610)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-08  Antoine Quint  <graouts@webkit.org>
+
+        REGRESSION (r256095): Adding a border-radius, border, or box-shadow breaks animations from scale(0)
+        https://bugs.webkit.org/show_bug.cgi?id=218371
+        <rdar://problem/70906316>
+
+        Reviewed by Simon Fraser.
+
+        Add a test where we have an animation on an element with a a border and a transform animation to scale(0) where the
+        first keyframe is implicit. This test would fail prior to this patch.
+
+        * webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html: Added.
+        * webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html: Added.
+
</ins><span class="cx"> 2021-06-08  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Update libwebrtc to M92
</span></span></pre></div>
<a id="trunkLayoutTestswebanimationsacceleratedtransformanimationtoscalezerowithimplicitfromkeyframeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html (0 => 278610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html                          (rev 0)
+++ trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html     2021-06-08 16:27:50 UTC (rev 278610)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<style>
+
+div {
+  width: 100px;
+  height: 100px;
+  margin-bottom: 2rem;
+  border: 10px solid green;
+  background-color: green;
+}
+
+</style>
+<div></div>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestswebanimationsacceleratedtransformanimationtoscalezerowithimplicitfromkeyframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html (0 => 278610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html                           (rev 0)
+++ trunk/LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html      2021-06-08 16:27:50 UTC (rev 278610)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<body>
+<style>
+
+div {
+  width: 100px;
+  height: 100px;
+  margin-bottom: 2rem;
+  border: 10px solid green;
+  background-color: green;
+}
+
+</style>
+<script>
+
+document.body.appendChild(document.createElement("div")).animate({ transform: "scale(0)" }, 1000 * 60 * 60 * 24);
+
+</script>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278609 => 278610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-08 16:14:14 UTC (rev 278609)
+++ trunk/Source/WebCore/ChangeLog      2021-06-08 16:27:50 UTC (rev 278610)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-06-08  Antoine Quint  <graouts@webkit.org>
+
+        REGRESSION (r256095): Adding a border-radius, border, or box-shadow breaks animations from scale(0)
+        https://bugs.webkit.org/show_bug.cgi?id=218371
+        <rdar://problem/70906316>
+
+        Reviewed by Simon Fraser.
+
+        When computing an animation's transform extent, we must account for implicit keyframes.
+
+        Test: webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html
+
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::computeExtentOfTransformAnimation const):
+
</ins><span class="cx"> 2021-06-08  Youenn Fablet  <youenn@apple.com> and Victor M. Jaquez L. <vjaquez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Update libwebrtc to M92
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationKeyframeEffectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/KeyframeEffect.cpp (278609 => 278610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/KeyframeEffect.cpp        2021-06-08 16:14:14 UTC (rev 278609)
+++ trunk/Source/WebCore/animation/KeyframeEffect.cpp   2021-06-08 16:27:50 UTC (rev 278610)
</span><span class="lines">@@ -1895,6 +1895,22 @@
</span><span class="cx"> 
</span><span class="cx">     LayoutRect cumulativeBounds;
</span><span class="cx"> 
</span><ins>+    auto addStyleToCumulativeBounds = [&](const RenderStyle* style) -> bool {
+        auto keyframeBounds = bounds;
+
+        bool canCompute;
+        if (transformFunctionListsMatch())
+            canCompute = computeTransformedExtentViaTransformList(rendererBox, *style, keyframeBounds);
+        else
+            canCompute = computeTransformedExtentViaMatrix(rendererBox, *style, keyframeBounds);
+
+        if (!canCompute)
+            return false;
+
+        cumulativeBounds.unite(keyframeBounds);
+        return true;
+    };
+
</ins><span class="cx">     for (const auto& keyframe : m_blendingKeyframes.keyframes()) {
</span><span class="cx">         const auto* keyframeStyle = keyframe.style();
</span><span class="cx"> 
</span><span class="lines">@@ -1907,18 +1923,13 @@
</span><span class="cx">                 continue;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        auto keyframeBounds = bounds;
</del><ins>+        if (!addStyleToCumulativeBounds(keyframeStyle))
+            return false;
+    }
</ins><span class="cx"> 
</span><del>-        bool canCompute;
-        if (transformFunctionListsMatch())
-            canCompute = computeTransformedExtentViaTransformList(rendererBox, *keyframeStyle, keyframeBounds);
-        else
-            canCompute = computeTransformedExtentViaMatrix(rendererBox, *keyframeStyle, keyframeBounds);
-
-        if (!canCompute)
</del><ins>+    if (m_blendingKeyframes.hasImplicitKeyframes()) {
+        if (!addStyleToCumulativeBounds(&box.style()))
</ins><span class="cx">             return false;
</span><del>-
-        cumulativeBounds.unite(keyframeBounds);
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     bounds = cumulativeBounds;
</span></span></pre>
</div>
</div>

</body>
</html>