Changeset 243112 in webkit

Timestamp:

Mar 18, 2019 3:45:47 PM (5 years ago)

Author:

Alan Bujtas

Message:

Call transition and animation callbacks on non-composited renderers too.
​https://bugs.webkit.org/show_bug.cgi?id=195907

Reviewed by Simon Fraser.

These callbacks are not composited specific functions.

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::freezeAtTime):
(WebCore::AnimationBase::compositedRenderer const): Deleted.

• page/animation/AnimationBase.h:
• page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::startAnimation):
(WebCore::ImplicitAnimation::pauseAnimation):
(WebCore::ImplicitAnimation::endAnimation):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::startAnimation):
(WebCore::KeyframeAnimation::pauseAnimation):
(WebCore::KeyframeAnimation::endAnimation):

• rendering/RenderLayerModelObject.cpp:

(WebCore::RenderLayerModelObject::startTransition):
(WebCore::RenderLayerModelObject::transitionPaused):
(WebCore::RenderLayerModelObject::transitionFinished):
(WebCore::RenderLayerModelObject::startAnimation):
(WebCore::RenderLayerModelObject::animationPaused):
(WebCore::RenderLayerModelObject::animationSeeked):
(WebCore::RenderLayerModelObject::animationFinished):
(WebCore::RenderLayerModelObject::suspendAnimations):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/AnimationBase.cpp (modified) (2 diffs)
• page/animation/AnimationBase.h (modified) (2 diffs)
• page/animation/ImplicitAnimation.cpp (modified) (3 diffs)
• page/animation/KeyframeAnimation.cpp (modified) (3 diffs)
• rendering/RenderLayerModelObject.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-18  Zalan Bujtas  <zalan@apple.com>
+
+        Call transition and animation callbacks on non-composited renderers too.
+        https://bugs.webkit.org/show_bug.cgi?id=195907
+
+        Reviewed by Simon Fraser.
+
+        These callbacks are not composited specific functions.
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::freezeAtTime):
+        (WebCore::AnimationBase::compositedRenderer const): Deleted.
+        * page/animation/AnimationBase.h:
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::startAnimation):
+        (WebCore::ImplicitAnimation::pauseAnimation):
+        (WebCore::ImplicitAnimation::endAnimation):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::startAnimation):
+        (WebCore::KeyframeAnimation::pauseAnimation):
+        (WebCore::KeyframeAnimation::endAnimation):
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::startTransition):
+        (WebCore::RenderLayerModelObject::transitionPaused):
+        (WebCore::RenderLayerModelObject::transitionFinished):
+        (WebCore::RenderLayerModelObject::startAnimation):
+        (WebCore::RenderLayerModelObject::animationPaused):
+        (WebCore::RenderLayerModelObject::animationSeeked):
+        (WebCore::RenderLayerModelObject::animationFinished):
+        (WebCore::RenderLayerModelObject::suspendAnimations):
+
 2019-03-18  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/animation/AnimationBase.cpp

@@ -70 +70 @@
 }
 
-RenderLayerModelObject* AnimationBase::compositedRenderer() const
-{
-    auto* renderer = this->renderer();
-    if (!renderer || !renderer->isComposited())
-        return nullptr;
-    return downcast<RenderLayerModelObject>(renderer);
-}
-
 void AnimationBase::clear()
 {
@@ -680 +672 @@
         m_pauseTime = m_startTime.valueOr(0) + t - m_animation->delay();
 
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         renderer->suspendAnimations(MonotonicTime::fromRawSeconds(m_pauseTime.value()));
 }

trunk/Source/WebCore/page/animation/AnimationBase.h

@@ -40 +40 @@
 class FloatRect;
 class LayoutRect;
-class RenderLayerModelObject;
 class RenderElement;
 class RenderStyle;
@@ -63 +62 @@
     const RenderStyle& currentStyle() const override;
     RenderElement* renderer() const override;
-    RenderLayerModelObject* compositedRenderer() const;
     void clear();
 

trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp

@@ -145 +145 @@
 bool ImplicitAnimation::startAnimation(double timeOffset)
 {
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         return renderer->startTransition(timeOffset, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
     return false;
@@ -152 +152 @@
 void ImplicitAnimation::pauseAnimation(double timeOffset)
 {
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         renderer->transitionPaused(timeOffset, m_animatingProperty);
     // Restore the original (unanimated) style
@@ -161 +161 @@
 void ImplicitAnimation::endAnimation(bool)
 {
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         renderer->transitionFinished(m_animatingProperty);
 }

trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp

@@ -292 +292 @@
 bool KeyframeAnimation::startAnimation(double timeOffset)
 {
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         return renderer->startAnimation(timeOffset, m_animation.ptr(), m_keyframes);
     return false;
@@ -302 +302 @@
         return;
 
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         renderer->animationPaused(timeOffset, m_keyframes.animationName());
 
@@ -315 +315 @@
         return;
 
-    if (auto* renderer = compositedRenderer())
+    if (auto* renderer = this->renderer())
         renderer->animationFinished(m_keyframes.animationName());
 

trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp

@@ -286 +286 @@
 bool RenderLayerModelObject::startTransition(double timeOffset, CSSPropertyID propertyId, const RenderStyle* fromStyle, const RenderStyle* toStyle)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return false;
     return layer()->backing()->startTransition(timeOffset, propertyId, fromStyle, toStyle);
 }
@@ -293 +293 @@
 void RenderLayerModelObject::transitionPaused(double timeOffset, CSSPropertyID propertyId)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return;
     layer()->backing()->transitionPaused(timeOffset, propertyId);
 }
@@ -300 +300 @@
 void RenderLayerModelObject::transitionFinished(CSSPropertyID propertyId)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return;
     layer()->backing()->transitionFinished(propertyId);
 }
@@ -307 +307 @@
 bool RenderLayerModelObject::startAnimation(double timeOffset, const Animation* animation, const KeyframeList& keyframes)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return false;
     return layer()->backing()->startAnimation(timeOffset, animation, keyframes);
 }
@@ -314 +314 @@
 void RenderLayerModelObject::animationPaused(double timeOffset, const String& name)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return;
     layer()->backing()->animationPaused(timeOffset, name);
 }
@@ -321 +321 @@
 void RenderLayerModelObject::animationSeeked(double timeOffset, const String& name)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return;
     layer()->backing()->animationSeeked(timeOffset, name);
 }
@@ -328 +328 @@
 void RenderLayerModelObject::animationFinished(const String& name)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return;
     layer()->backing()->animationFinished(name);
 }
@@ -335 +335 @@
 void RenderLayerModelObject::suspendAnimations(MonotonicTime time)
 {
-    ASSERT(hasLayer());
-    ASSERT(isComposited());
+    if (!layer() || !layer()->backing())
+        return;
     layer()->backing()->suspendAnimations(time);
 }