Changeset 258842 in webkit

Timestamp:

Mar 23, 2020, 7:41:04 AM (5 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Refactor cancelDeclarativeAnimationsForElement and willDestroyRendererForElement on AnimationTimeline
​https://bugs.webkit.org/show_bug.cgi?id=209423

Reviewed by Antti Koivisto.

The methods cancelDeclarativeAnimationsForElement and willDestroyRendererForElement on AnimationTimeline did the same
thing save for the argument passed to WebAnimation::cancel(). We now refactor those two methods into a single
cancelDeclarativeAnimationsForElement method with an argument to set whether cancelation should be silent.
As a result, we also change WebAnimation::cancel() to have a single flavor instead of one without an argument and one
with the silent argument.

No test because there is no change in visible behavior.

• animation/AnimationTimeline.cpp:

(WebCore::AnimationTimeline::elementWasRemoved):
(WebCore::AnimationTimeline::cancelDeclarativeAnimationsForElement):
(WebCore::AnimationTimeline::willDestroyRendererForElement): Deleted.

• animation/AnimationTimeline.h:
• animation/DeclarativeAnimation.cpp:

(WebCore::DeclarativeAnimation::cancel):

• animation/DeclarativeAnimation.h:
• animation/WebAnimation.cpp:
• animation/WebAnimation.h:
• rendering/updating/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::tearDownRenderers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/AnimationTimeline.cpp (modified) (2 diffs)
• animation/AnimationTimeline.h (modified) (1 diff)
• animation/DeclarativeAnimation.cpp (modified) (2 diffs)
• animation/DeclarativeAnimation.h (modified) (1 diff)
• animation/WebAnimation.cpp (modified) (1 diff)
• animation/WebAnimation.h (modified) (1 diff)
• rendering/updating/RenderTreeUpdater.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-23  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Refactor cancelDeclarativeAnimationsForElement and willDestroyRendererForElement on AnimationTimeline
+        https://bugs.webkit.org/show_bug.cgi?id=209423
+
+        Reviewed by Antti Koivisto.
+
+        The methods cancelDeclarativeAnimationsForElement and willDestroyRendererForElement on AnimationTimeline did the same
+        thing save for the argument passed to WebAnimation::cancel(). We now refactor those two methods into a single
+        cancelDeclarativeAnimationsForElement method with an argument to set whether cancelation should be silent.
+        As a result, we also change WebAnimation::cancel() to have a single flavor instead of one without an argument and one
+        with the silent argument.
+
+        No test because there is no change in visible behavior.
+
+        * animation/AnimationTimeline.cpp:
+        (WebCore::AnimationTimeline::elementWasRemoved):
+        (WebCore::AnimationTimeline::cancelDeclarativeAnimationsForElement):
+        (WebCore::AnimationTimeline::willDestroyRendererForElement): Deleted.
+        * animation/AnimationTimeline.h:
+        * animation/DeclarativeAnimation.cpp:
+        (WebCore::DeclarativeAnimation::cancel):
+        * animation/DeclarativeAnimation.h:
+        * animation/WebAnimation.cpp:
+        * animation/WebAnimation.h:
+        * rendering/updating/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::tearDownRenderers):
+
 2020-03-23  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/animation/AnimationTimeline.cpp

@@ -189 +189 @@
 }
 
-void AnimationTimeline::willDestroyRendererForElement(Element& element)
+void AnimationTimeline::elementWasRemoved(Element& element)
+{
+    cancelDeclarativeAnimationsForElement(element, WebAnimation::Silently::Yes);
+}
+
+void AnimationTimeline::removeAnimationsForElement(Element& element)
+{
+    for (auto& animation : animationsForElement(element))
+        animation->remove();
+}
+
+void AnimationTimeline::willChangeRendererForElement(Element& element)
+{
+    for (auto& animation : animationsForElement(element))
+        animation->willChangeRenderer();
+}
+
+void AnimationTimeline::cancelDeclarativeAnimationsForElement(Element& element, WebAnimation::Silently silently)
 {
     if (auto* transitions = element.transitions()) {
         for (auto& cssTransition : *transitions)
-            cssTransition->cancel(WebAnimation::Silently::Yes);
+            cssTransition->cancel(silently);
     }
 
@@ -200 +217 @@
             if (is<CSSAnimation>(cssAnimation))
                 removeCSSAnimationCreatedByMarkup(element, downcast<CSSAnimation>(*cssAnimation));
-            cssAnimation->cancel(WebAnimation::Silently::Yes);
-        }
-    }
-}
-
-void AnimationTimeline::elementWasRemoved(Element& element)
-{
-    willDestroyRendererForElement(element);
-}
-
-void AnimationTimeline::removeAnimationsForElement(Element& element)
-{
-    for (auto& animation : animationsForElement(element))
-        animation->remove();
-}
-
-void AnimationTimeline::willChangeRendererForElement(Element& element)
-{
-    for (auto& animation : animationsForElement(element))
-        animation->willChangeRenderer();
-}
-
-void AnimationTimeline::cancelDeclarativeAnimationsForElement(Element& element)
-{
-    if (auto* transitions = element.transitions()) {
-        for (auto& cssTransition : *transitions)
-            cssTransition->cancel();
-    }
-
-    if (auto* cssAnimations = element.cssAnimations()) {
-        for (auto& cssAnimation : *cssAnimations) {
-            if (is<CSSAnimation>(cssAnimation))
-                removeCSSAnimationCreatedByMarkup(element, downcast<CSSAnimation>(*cssAnimation));
-            cssAnimation->cancel();
+            cssAnimation->cancel(silently);
         }
     }

trunk/Source/WebCore/animation/AnimationTimeline.h

@@ -65 +65 @@
 
     void willChangeRendererForElement(Element&);
-    void willDestroyRendererForElement(Element&);
-    void cancelDeclarativeAnimationsForElement(Element&);
+    void cancelDeclarativeAnimationsForElement(Element&, WebAnimation::Silently);
 
     virtual void animationWasAddedToElement(WebAnimation&, Element&);

trunk/Source/WebCore/animation/DeclarativeAnimation.cpp

@@ -209 +209 @@
 }
 
-void DeclarativeAnimation::cancel()
+void DeclarativeAnimation::cancel(Silently silently)
 {
     auto cancelationTime = 0_s;
@@ -217 +217 @@
     }
 
-    WebAnimation::cancel();
+    WebAnimation::cancel(silently);
 
     invalidateDOMEvents(cancelationTime);

trunk/Source/WebCore/animation/DeclarativeAnimation.h

@@ -64 +64 @@
 
     void setTimeline(RefPtr<AnimationTimeline>&&) final;
-    void cancel() final;
+    void cancel(Silently = Silently::No) final;
 
     void tick() override;

trunk/Source/WebCore/animation/WebAnimation.cpp

@@ -603 +603 @@
     // If the animation has no target effect, the target effect end is zero.
     return m_effect ? m_effect->endTime() : 0_s;
-}
-
-void WebAnimation::cancel()
-{
-    cancel(Silently::No);
-    invalidateEffect();
 }
 

trunk/Source/WebCore/animation/WebAnimation.h

@@ -94 +94 @@
     FinishedPromise& finished() { return m_finishedPromise.get(); }
 
-    virtual void cancel();
-    void cancel(Silently);
+    virtual void cancel(Silently = Silently::No);
     ExceptionOr<void> finish();
     ExceptionOr<void> play();

trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp

@@ -574 +574 @@
                 if (timeline) {
                     if (document.renderTreeBeingDestroyed())
-                        timeline->willDestroyRendererForElement(element);
+                        timeline->cancelDeclarativeAnimationsForElement(element, WebAnimation::Silently::Yes);
                     else if (teardownType == TeardownType::RendererUpdateCancelingAnimations)
-                        timeline->cancelDeclarativeAnimationsForElement(element);
+                        timeline->cancelDeclarativeAnimationsForElement(element, WebAnimation::Silently::No);
                 }
                 animationController.cancelAnimations(element);