Changeset 285728 in webkit

Timestamp:

Nov 12, 2021, 9:40:47 AM (5 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Accelerated animations with a single keyframe don't account for prior forward-filling animations
​https://bugs.webkit.org/show_bug.cgi?id=233041
<rdar://problem/85236241>

Reviewed by Dean Jackson.

Source/WebCore:

Test: webanimations/accelerated-animation-after-forward-filling-animation.html

When starting an accelerated animation, we would fill any implicit keyframes based on the unanimated style.
We now also apply all animations below this animation in the target's effect stack such that a previous
forward-filling animation is accounted for.

• animation/KeyframeEffect.cpp:

(WebCore::KeyframeEffect::applyPendingAcceleratedActions):

LayoutTests:

Add a new test that runs a forward-filling animation for transform, waits for its completion,
then runs another transform animation with an implicit initial keyframe, ensuring that the
result of the first forward-filling animation is accounted for when computing the initial
keyframe.

This test would fail prior to this patch.

• webanimations/accelerated-animation-after-forward-filling-animation-expected.html: Added.
• webanimations/accelerated-animation-after-forward-filling-animation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/accelerated-animation-after-forward-filling-animation-expected.html (added)
• LayoutTests/webanimations/accelerated-animation-after-forward-filling-animation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-12  Antoine Quint  <graouts@webkit.org>
+
+        [Web Animations] Accelerated animations with a single keyframe don't account for prior forward-filling animations
+        https://bugs.webkit.org/show_bug.cgi?id=233041
+        <rdar://problem/85236241>
+
+        Reviewed by Dean Jackson.
+
+        Add a new test that runs a forward-filling animation for `transform`, waits for its completion,
+        then runs another `transform` animation with an implicit initial keyframe, ensuring that the
+        result of the first forward-filling animation is accounted for when computing the initial
+        keyframe.
+
+        This test would fail prior to this patch.
+
+        * webanimations/accelerated-animation-after-forward-filling-animation-expected.html: Added.
+        * webanimations/accelerated-animation-after-forward-filling-animation.html: Added.
+
 2021-11-12  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-12  Antoine Quint  <graouts@webkit.org>
+
+        [Web Animations] Accelerated animations with a single keyframe don't account for prior forward-filling animations
+        https://bugs.webkit.org/show_bug.cgi?id=233041
+        <rdar://problem/85236241>
+
+        Reviewed by Dean Jackson.
+
+        Test: webanimations/accelerated-animation-after-forward-filling-animation.html
+
+        When starting an accelerated animation, we would fill any implicit keyframes based on the unanimated style.
+        We now also apply all animations below this animation in the target's effect stack such that a previous
+        forward-filling animation is accounted for.
+
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::applyPendingAcceleratedActions):
+
 2021-11-12  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/animation/KeyframeEffect.cpp

@@ -1789 +1789 @@
         ASSERT(lastStyleChangeEventStyle);
 
+        // We need to resolve all animations up to this point to ensure any forward-filling
+        // effect is accounted for when computing the "from" value for the accelerated animation.
+        auto underlyingStyle = RenderStyle::clonePtr(*lastStyleChangeEventStyle);
+        auto* effectStack = m_target->keyframeEffectStack(m_pseudoId);
+        ASSERT(effectStack);
+
+        for (const auto& effect : effectStack->sortedEffects()) {
+            if (this == effect.get())
+                break;
+            if (auto progress = effect->getComputedTiming().progress)
+                effect->setAnimatedPropertiesInStyle(*underlyingStyle, *progress);
+        }
+
         KeyframeList explicitKeyframes(m_blendingKeyframes.animationName());
         explicitKeyframes.copyKeyframes(m_blendingKeyframes);
-        explicitKeyframes.fillImplicitKeyframes(*m_target, m_target->styleResolver(), lastStyleChangeEventStyle, nullptr);
+        explicitKeyframes.fillImplicitKeyframes(*m_target, m_target->styleResolver(), underlyingStyle.get(), nullptr);
         return renderer->startAnimation(timeOffset, backingAnimationForCompositedRenderer(), explicitKeyframes) ? RunningAccelerated::Yes : RunningAccelerated::No;
     };