Changeset 278610 in webkit

Timestamp:

Jun 8, 2021, 9:27:50 AM (5 years ago)

Author:

graouts@webkit.org

Message:

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.

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe-expected.html (added)
• LayoutTests/webanimations/accelerated-transform-animation-to-scale-zero-with-implicit-from-keyframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2021-06-08  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2021-06-08  Youenn Fablet  <youenn@apple.com> and Victor M. Jaquez L. <vjaquez@igalia.com>
 

trunk/Source/WebCore/animation/KeyframeEffect.cpp

@@ -1896 +1896 @@
     LayoutRect cumulativeBounds;
 
+    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;
+    };
+
     for (const auto& keyframe : m_blendingKeyframes.keyframes()) {
         const auto* keyframeStyle = keyframe.style();
@@ -1908 +1924 @@
         }
 
-        auto keyframeBounds = bounds;
-
-        bool canCompute;
-        if (transformFunctionListsMatch())
-            canCompute = computeTransformedExtentViaTransformList(rendererBox, *keyframeStyle, keyframeBounds);
-        else
-            canCompute = computeTransformedExtentViaMatrix(rendererBox, *keyframeStyle, keyframeBounds);
-
-        if (!canCompute)
+        if (!addStyleToCumulativeBounds(keyframeStyle))
             return false;
-
-        cumulativeBounds.unite(keyframeBounds);
+    }
+
+    if (m_blendingKeyframes.hasImplicitKeyframes()) {
+        if (!addStyleToCumulativeBounds(&box.style()))
+            return false;
     }