Changeset 261756 in webkit

Timestamp:

May 15, 2020 1:07:26 PM (4 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Animation with a single keyframe is not accelerated
​https://bugs.webkit.org/show_bug.cgi?id=188730
<rdar://problem/43481113>

Reviewed by Dean Jackson.

Source/WebCore:

Test: webanimations/accelerated-animation-single-keyframe.html

Prior to attempting to run an accelerated effect, ensure that the KeyframeList passed to
RenderLayerModelObject::startAnimation() does not have implicit keyframes since eventually
GraphicsLayerCA::animationCanBeAccelerated() would be called and would reject a single-keyframe
animation. To do this, we use the same code used in Style::Resolver::keyframeStylesForAnimation()
which we refactor in the new KeyframeList::fillImplicitKeyframes() method.

• animation/KeyframeEffect.cpp:

(WebCore::KeyframeEffect::copyPropertiesFromSource):
(WebCore::KeyframeEffect::applyPendingAcceleratedActions):

• rendering/style/KeyframeList.cpp:

(WebCore::KeyframeList::hasImplicitKeyframes const):
(WebCore::KeyframeList::copyKeyframes):
(WebCore::zeroPercentKeyframe):
(WebCore::hundredPercentKeyframe):
(WebCore::KeyframeList::fillImplicitKeyframes):

• rendering/style/KeyframeList.h:
• style/StyleResolver.cpp:

(WebCore::Style::Resolver::keyframeStylesForAnimation):

LayoutTests:

Add a new test that runs a single-keyframe transform animation and checks that it runs accelerated.

• webanimations/accelerated-animation-single-keyframe-expected.txt: Added.
• webanimations/accelerated-animation-single-keyframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/accelerated-animation-single-keyframe-expected.txt (added)
• LayoutTests/webanimations/accelerated-animation-single-keyframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/KeyframeEffect.cpp (modified) (3 diffs)
• Source/WebCore/rendering/style/KeyframeList.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/KeyframeList.h (modified) (3 diffs)
• Source/WebCore/style/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-15  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Animation with a single keyframe is not accelerated
+        https://bugs.webkit.org/show_bug.cgi?id=188730
+        <rdar://problem/43481113>
+
+        Reviewed by Dean Jackson.
+
+        Add a new test that runs a single-keyframe transform animation and checks that it runs accelerated.
+
+        * webanimations/accelerated-animation-single-keyframe-expected.txt: Added.
+        * webanimations/accelerated-animation-single-keyframe.html: Added.
+
 2020-05-15  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-15  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Animation with a single keyframe is not accelerated
+        https://bugs.webkit.org/show_bug.cgi?id=188730
+        <rdar://problem/43481113>
+
+        Reviewed by Dean Jackson.
+
+        Test: webanimations/accelerated-animation-single-keyframe.html
+
+        Prior to attempting to run an accelerated effect, ensure that the KeyframeList passed to
+        RenderLayerModelObject::startAnimation() does not have implicit keyframes since eventually
+        GraphicsLayerCA::animationCanBeAccelerated() would be called and would reject a single-keyframe
+        animation. To do this, we use the same code used in Style::Resolver::keyframeStylesForAnimation()
+        which we refactor in the new KeyframeList::fillImplicitKeyframes() method.
+
+        * animation/KeyframeEffect.cpp:
+        (WebCore::KeyframeEffect::copyPropertiesFromSource):
+        (WebCore::KeyframeEffect::applyPendingAcceleratedActions):
+        * rendering/style/KeyframeList.cpp:
+        (WebCore::KeyframeList::hasImplicitKeyframes const):
+        (WebCore::KeyframeList::copyKeyframes):
+        (WebCore::zeroPercentKeyframe):
+        (WebCore::hundredPercentKeyframe):
+        (WebCore::KeyframeList::fillImplicitKeyframes):
+        * rendering/style/KeyframeList.h:
+        * style/StyleResolver.cpp:
+        (WebCore::Style::Resolver::keyframeStylesForAnimation):
+
 2020-05-15  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/animation/KeyframeEffect.cpp

@@ -566 +566 @@
 
     KeyframeList keyframeList("keyframe-effect-" + createCanonicalUUIDString());
-    for (auto& keyframe : source->m_blendingKeyframes.keyframes()) {
-        KeyframeValue keyframeValue(keyframe.key(), RenderStyle::clonePtr(*keyframe.style()));
-        for (auto propertyId : keyframe.properties())
-            keyframeValue.addProperty(propertyId);
-        keyframeList.insert(WTFMove(keyframeValue));
-    }
+    keyframeList.copyKeyframes(source->m_blendingKeyframes);
     setBlendingKeyframes(keyframeList);
 }
@@ -1579 +1574 @@
     auto timeOffset = animation()->currentTime().valueOr(0_s).seconds() - delay().seconds();
 
+    auto startAnimation = [&]() -> bool {
+        renderer->animationFinished(m_blendingKeyframes.animationName());
+
+        if (!m_blendingKeyframes.hasImplicitKeyframes())
+            return renderer->startAnimation(timeOffset, backingAnimationForCompositedRenderer(), m_blendingKeyframes);
+
+        ASSERT(m_unanimatedStyle);
+        ASSERT(m_target);
+        KeyframeList explicitKeyframes(m_blendingKeyframes.animationName());
+        explicitKeyframes.copyKeyframes(m_blendingKeyframes);
+        explicitKeyframes.fillImplicitKeyframes(*m_target, m_target->styleResolver(), m_unanimatedStyle.get());
+        return renderer->startAnimation(timeOffset, backingAnimationForCompositedRenderer(), explicitKeyframes);
+    };
+
     for (const auto& action : pendingAcceleratedActions) {
         switch (action) {
         case AcceleratedAction::Play:
-            renderer->animationFinished(m_blendingKeyframes.animationName());
-            m_isRunningAccelerated = renderer->startAnimation(timeOffset, backingAnimationForCompositedRenderer(), m_blendingKeyframes);
+            m_isRunningAccelerated = startAnimation();
             if (!m_isRunningAccelerated) {
                 m_lastRecordedAcceleratedAction = AcceleratedAction::Stop;
@@ -1593 +1601 @@
             break;
         case AcceleratedAction::UpdateTiming:
-            renderer->animationFinished(m_blendingKeyframes.animationName());
-            renderer->startAnimation(timeOffset, backingAnimationForCompositedRenderer(), m_blendingKeyframes);
+            startAnimation();
             if (animation()->playState() == WebAnimation::PlayState::Paused)
                 renderer->animationPaused(timeOffset, m_blendingKeyframes.animationName());

trunk/Source/WebCore/rendering/style/KeyframeList.cpp

@@ -24 +24 @@
 
 #include "Animation.h"
+#include "CSSKeyframeRule.h"
 #include "RenderObject.h"
+#include "StyleResolver.h"
 
 namespace WebCore {
@@ -75 +77 @@
 }
 
+bool KeyframeList::hasImplicitKeyframes() const
+{
+    return size() && (m_keyframes[0].key() || m_keyframes[size() - 1].key() != 1);
+}
+
+void KeyframeList::copyKeyframes(KeyframeList& other)
+{
+    for (auto& keyframe : other.keyframes()) {
+        KeyframeValue keyframeValue(keyframe.key(), RenderStyle::clonePtr(*keyframe.style()));
+        for (auto propertyId : keyframe.properties())
+            keyframeValue.addProperty(propertyId);
+        insert(WTFMove(keyframeValue));
+    }
+}
+
+static const StyleRuleKeyframe& zeroPercentKeyframe()
+{
+    static LazyNeverDestroyed<Ref<StyleRuleKeyframe>> rule;
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        rule.construct(StyleRuleKeyframe::create(MutableStyleProperties::create()));
+        rule.get()->setKey(0);
+    });
+    return rule.get().get();
+}
+
+static const StyleRuleKeyframe& hundredPercentKeyframe()
+{
+    static LazyNeverDestroyed<Ref<StyleRuleKeyframe>> rule;
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        rule.construct(StyleRuleKeyframe::create(MutableStyleProperties::create()));
+        rule.get()->setKey(1);
+    });
+    return rule.get().get();
+}
+
+void KeyframeList::fillImplicitKeyframes(const Element& element, Style::Resolver& styleResolver, const RenderStyle* elementStyle)
+{
+    // If the 0% keyframe is missing, create it (but only if there is at least one other keyframe).
+    auto initialSize = size();
+    if (initialSize > 0 && m_keyframes[0].key()) {
+        KeyframeValue keyframeValue(0, nullptr);
+        keyframeValue.setStyle(styleResolver.styleForKeyframe(element, elementStyle, &zeroPercentKeyframe(), keyframeValue));
+        insert(WTFMove(keyframeValue));
+    }
+
+    // If the 100% keyframe is missing, create it (but only if there is at least one other keyframe).
+    if (initialSize > 0 && (m_keyframes[size() - 1].key() != 1)) {
+        KeyframeValue keyframeValue(1, nullptr);
+        keyframeValue.setStyle(styleResolver.styleForKeyframe(element, elementStyle, &hundredPercentKeyframe(), keyframeValue));
+        insert(WTFMove(keyframeValue));
+    }
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/style/KeyframeList.h

@@ -35 +35 @@
 class TimingFunction;
 
+namespace Style {
+class Resolver;
+}
+
 class KeyframeValue {
 public:
@@ -55 +59 @@
     TimingFunction* timingFunction() const { return m_timingFunction.get(); }
     void setTimingFunction(const RefPtr<TimingFunction>& timingFunction) { m_timingFunction = timingFunction; }
-    
+
 private:
     double m_key;
@@ -89 +93 @@
     const Vector<KeyframeValue>& keyframes() const { return m_keyframes; }
 
+    void copyKeyframes(KeyframeList&);
+    bool hasImplicitKeyframes() const;
+    void fillImplicitKeyframes(const Element&, Style::Resolver&, const RenderStyle*);
+
 private:
     AtomString m_animationName;

trunk/Source/WebCore/style/StyleResolver.cpp

@@ -360 +360 @@
     }
 
-    // If the 0% keyframe is missing, create it (but only if there is at least one other keyframe).
-    int initialListSize = list.size();
-    if (initialListSize > 0 && list[0].key()) {
-        static StyleRuleKeyframe* zeroPercentKeyframe;
-        if (!zeroPercentKeyframe) {
-            zeroPercentKeyframe = &StyleRuleKeyframe::create(MutableStyleProperties::create()).leakRef();
-            zeroPercentKeyframe->setKey(0);
-        }
-        KeyframeValue keyframeValue(0, nullptr);
-        keyframeValue.setStyle(styleForKeyframe(element, elementStyle, zeroPercentKeyframe, keyframeValue));
-        list.insert(WTFMove(keyframeValue));
-    }
-
-    // If the 100% keyframe is missing, create it (but only if there is at least one other keyframe).
-    if (initialListSize > 0 && (list[list.size() - 1].key() != 1)) {
-        static StyleRuleKeyframe* hundredPercentKeyframe;
-        if (!hundredPercentKeyframe) {
-            hundredPercentKeyframe = &StyleRuleKeyframe::create(MutableStyleProperties::create()).leakRef();
-            hundredPercentKeyframe->setKey(1);
-        }
-        KeyframeValue keyframeValue(1, nullptr);
-        keyframeValue.setStyle(styleForKeyframe(element, elementStyle, hundredPercentKeyframe, keyframeValue));
-        list.insert(WTFMove(keyframeValue));
-    }
+    list.fillImplicitKeyframes(element, *this, elementStyle);
 }