Changeset 289455 in webkit

Timestamp:

Feb 8, 2022, 10:39:34 PM (4 years ago)

Author:

graouts@webkit.org

Message:

Move DocumentTimeline::runningAnimationsForRendererAreAllAccelerated() to Styleable
​https://bugs.webkit.org/show_bug.cgi?id=236239

Reviewed by Dean Jackson.

This method has nothing to do with DocumentTimeline and everything to do with Styleable and its associated
effect stack. This also allows us to remove WebAnimation::isRunningAccelerated() since we don't need to go
through the animation as we iterate over keyframe effects directly.

This refactor surfaced an issue with Styleable::fromRenderer() where in the ::marker case we would fail
to correctly obtain the parent RenderListItem, we now recurse through parents until we find one instead
of stopping at the first ancestor with an element.

• animation/DocumentTimeline.cpp:

(WebCore::DocumentTimeline::runningAnimationsForRendererAreAllAccelerated const): Deleted.

• animation/DocumentTimeline.h:
• animation/WebAnimation.cpp:

(WebCore::WebAnimation::isRunningAccelerated const): Deleted.

• animation/WebAnimation.h:
• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::hasRunningAcceleratedAnimations const):

• style/Styleable.cpp:

(WebCore::Styleable::fromRenderer):
(WebCore::Styleable::runningAnimationsAreAllAccelerated const):

• style/Styleable.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/DocumentTimeline.cpp (modified) (1 diff)
• animation/DocumentTimeline.h (modified) (1 diff)
• animation/WebAnimation.cpp (modified) (1 diff)
• animation/WebAnimation.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (3 diffs)
• style/Styleable.cpp (modified) (2 diffs)
• style/Styleable.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-08  Antoine Quint  <graouts@webkit.org>
+
+        Move DocumentTimeline::runningAnimationsForRendererAreAllAccelerated() to Styleable
+        https://bugs.webkit.org/show_bug.cgi?id=236239
+
+        Reviewed by Dean Jackson.
+
+        This method has nothing to do with DocumentTimeline and everything to do with Styleable and its associated
+        effect stack. This also allows us to remove WebAnimation::isRunningAccelerated() since we don't need to go
+        through the animation as we iterate over keyframe effects directly.
+
+        This refactor surfaced an issue with Styleable::fromRenderer() where in the ::marker case we would fail
+        to correctly obtain the parent RenderListItem, we now recurse through parents until we find one instead
+        of stopping at the first ancestor with an element.
+
+        * animation/DocumentTimeline.cpp:
+        (WebCore::DocumentTimeline::runningAnimationsForRendererAreAllAccelerated const): Deleted.
+        * animation/DocumentTimeline.h:
+        * animation/WebAnimation.cpp:
+        (WebCore::WebAnimation::isRunningAccelerated const): Deleted.
+        * animation/WebAnimation.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::hasRunningAcceleratedAnimations const):
+        * style/Styleable.cpp:
+        (WebCore::Styleable::fromRenderer):
+        (WebCore::Styleable::runningAnimationsAreAllAccelerated const):
+        * style/Styleable.h:
+
 2022-02-08  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/animation/DocumentTimeline.cpp

@@ -387 +387 @@
 }
 
-bool DocumentTimeline::runningAnimationsForRendererAreAllAccelerated(const RenderBoxModelObject& renderer) const
-{
-    auto styleable = Styleable::fromRenderer(renderer);
-    if (!styleable)
-        return false;
-
-    auto* animations = styleable->animations();
-    if (!animations || animations->isEmpty())
-        return false;
-
-    for (const auto& animation : *animations) {
-        if (!animation->isRunningAccelerated())
-            return false;
-    }
-
-    return true;
-}
-
 void DocumentTimeline::enqueueAnimationEvent(AnimationEventBase& event)
 {

trunk/Source/WebCore/animation/DocumentTimeline.h

@@ -62 +62 @@
 
     void animationAcceleratedRunningStateDidChange(WebAnimation&);
-    bool runningAnimationsForRendererAreAllAccelerated(const RenderBoxModelObject&) const;
     void detachFromDocument();
 

trunk/Source/WebCore/animation/WebAnimation.cpp

@@ -1253 +1253 @@
 }
 
-bool WebAnimation::isRunningAccelerated() const
-{
-    return is<KeyframeEffect>(m_effect) && downcast<KeyframeEffect>(*m_effect).isRunningAccelerated();
-}
-
 bool WebAnimation::needsTick() const
 {

trunk/Source/WebCore/animation/WebAnimation.h

@@ -135 +135 @@
     void willChangeRenderer();
 
-    bool isRunningAccelerated() const;
     bool isRelevant() const { return m_isRelevant; }
     void updateRelevance();

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -32 +32 @@
 #include "ColorBlending.h"
 #include "Document.h"
-#include "DocumentTimeline.h"
 #include "FloatRoundedRect.h"
 #include "Frame.h"
@@ -61 +60 @@
 #include "ScrollingConstraints.h"
 #include "Settings.h"
+#include "Styleable.h"
 #include "TextBoxPainter.h"
 #include "TransformState.h"
@@ -2700 +2700 @@
 bool RenderBoxModelObject::hasRunningAcceleratedAnimations() const
 {
-    if (auto* node = element()) {
-        if (auto* timeline = node->document().existingTimeline())
-            return timeline->runningAnimationsForRendererAreAllAccelerated(*this);
-    }
+    if (auto styleable = Styleable::fromRenderer(*this))
+        return styleable->runningAnimationsAreAllAccelerated();
     return false;
 }

trunk/Source/WebCore/style/Styleable.cpp

@@ -61 +61 @@
         }
         break;
-    case PseudoId::Marker:
-        if (auto* ancestor = renderer.parent()) {
-            while (ancestor && !ancestor->element())
-                ancestor = ancestor->parent();
-            ASSERT(is<RenderListItem>(ancestor));
-            ASSERT(downcast<RenderListItem>(ancestor)->markerRenderer() == &renderer);
-            return Styleable(*ancestor->element(), PseudoId::Marker);
+    case PseudoId::Marker: {
+        auto* ancestor = renderer.parent();
+        while (ancestor) {
+            if (is<RenderListItem>(ancestor) && ancestor->element() && downcast<RenderListItem>(ancestor)->markerRenderer() == &renderer)
+                return Styleable(*ancestor->element(), PseudoId::Marker);
+            ancestor = ancestor->parent();
         }
         break;
+    }
     case PseudoId::After:
     case PseudoId::Before:
@@ -162 +162 @@
 
     return false;
+}
+
+bool Styleable::runningAnimationsAreAllAccelerated() const
+{
+    auto* effectStack = keyframeEffectStack();
+    if (!effectStack || !effectStack->hasEffects())
+        return false;
+
+    for (const auto& effect : effectStack->sortedEffects()) {
+        if (!effect->isRunningAccelerated())
+            return false;
+    }
+
+    return true;
 }
 

trunk/Source/WebCore/style/Styleable.h

@@ -79 +79 @@
 
     bool isRunningAcceleratedTransformAnimation() const;
+
+    bool runningAnimationsAreAllAccelerated() const;
 
     KeyframeEffectStack* keyframeEffectStack() const