Changeset 208033 in webkit

Timestamp:

Oct 27, 2016 10:34:34 PM (8 years ago)

Author:

Simon Fraser

Message:

Remove RenderStyle::isRunningAcceleratedAnimation()
​https://bugs.webkit.org/show_bug.cgi?id=164109

Reviewed by David Hyatt.

RenderStyle::isRunningAcceleratedAnimation() was added in r40876 to handle interrupted
accelerated transitions, and to allow RenderLayer::currentTransform() to know when it
has to manually get the animated style.

The latter can now use isRunningAcceleratedAnimationOnRenderer(), and interrupting
accelerated transitions seems to work fine without it, so remove it.

• page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::animate):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::animate):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::currentTransform):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::isRunningAcceleratedAnimation): Deleted.
(WebCore::RenderStyle::setIsRunningAcceleratedAnimation): Deleted.

• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

• rendering/style/StyleRareNonInheritedData.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/ImplicitAnimation.cpp (modified) (1 diff)
• page/animation/KeyframeAnimation.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (2 diffs)
• rendering/style/StyleRareNonInheritedData.cpp (modified) (3 diffs)
• rendering/style/StyleRareNonInheritedData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove RenderStyle::isRunningAcceleratedAnimation()
+        https://bugs.webkit.org/show_bug.cgi?id=164109
+
+        Reviewed by David Hyatt.
+
+        RenderStyle::isRunningAcceleratedAnimation() was added in r40876 to handle interrupted
+        accelerated transitions, and to allow RenderLayer::currentTransform() to know when it
+        has to manually get the animated style.
+        
+        The latter can now use isRunningAcceleratedAnimationOnRenderer(), and interrupting
+        accelerated transitions seems to work fine without it, so remove it.
+
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::animate):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::animate):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::currentTransform):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::isRunningAcceleratedAnimation): Deleted.
+        (WebCore::RenderStyle::setIsRunningAcceleratedAnimation): Deleted.
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator==):
+        * rendering/style/StyleRareNonInheritedData.h:
+
 2016-10-27  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -80 +80 @@
         animatedStyle = RenderStyle::clonePtr(*targetStyle);
 
-    bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress());
+    CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress());
     // FIXME: we also need to detect cases where we have to software animate for other reasons,
     // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902
-    if (!needsAnim) {
-        // If we are running an accelerated animation, set a flag in the style which causes the style
-        // to compare as different to any other style. This ensures that changes to the property
-        // that is animating are correctly detected during the animation (e.g. when a transition
-        // gets interrupted).
-        // FIXME: still need this hack?
-        animatedStyle->setIsRunningAcceleratedAnimation();
-    }
 
     // Fire the start timeout if needed

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

@@ -177 +177 @@
         fetchIntervalEndpointsForProperty(propertyID, fromStyle, toStyle, progress);
 
-        bool needsAnim = CSSPropertyAnimation::blendProperties(this, propertyID, animatedStyle.get(), fromStyle, toStyle, progress);
-        if (!needsAnim)
-            // If we are running an accelerated animation, set a flag in the style
-            // to indicate it. This can be used to make sure we get an updated
-            // style for hit testing, etc.
-            // FIXME: still need this?
-            animatedStyle->setIsRunningAcceleratedAnimation();
+        CSSPropertyAnimation::blendProperties(this, propertyID, animatedStyle.get(), fromStyle, toStyle, progress);
     }
     

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -996 +996 @@
     
     RenderBox* box = renderBox();
-    ASSERT(box);
-    // FIXME: replace with call to AnimationController::isRunningAcceleratedAnimationOnRenderer() and remove RenderStyle::isRunningAcceleratedAnimation().
-    if (renderer().style().isRunningAcceleratedAnimation()) {
+
+    if (renderer().animation().isRunningAcceleratedAnimationOnRenderer(renderer(), CSSPropertyTransform, AnimationBase::Running | AnimationBase::Paused)) {
         TransformationMatrix currTransform;
         FloatRect pixelSnappedBorderRect = snapRectToDevicePixels(box->borderBoxRect(), box->document().deviceScaleFactor());

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

@@ -1121 +1121 @@
     PageSizeType pageSizeType() const { return static_cast<PageSizeType>(rareNonInheritedData->m_pageSizeType); }
     
-    // When set, this ensures that styles compare as different. Used during accelerated animations.
-    bool isRunningAcceleratedAnimation() const { return rareNonInheritedData->m_runningAcceleratedAnimation; }
-
     LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxContain; }
     const LineClampValue& lineClamp() const { return rareNonInheritedData->lineClamp; }
@@ -1695 +1692 @@
     void resetPageSizeType() { SET_VAR(rareNonInheritedData, m_pageSizeType, PAGE_SIZE_AUTO); }
 
-    void setIsRunningAcceleratedAnimation(bool b = true) { SET_VAR(rareNonInheritedData, m_runningAcceleratedAnimation, b); }
-
     void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); }
     void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }

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

@@ -97 +97 @@
     , m_textCombine(RenderStyle::initialTextCombine())
     , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
-    , m_runningAcceleratedAnimation(false)
     , m_aspectRatioType(RenderStyle::initialAspectRatioType())
 #if ENABLE(CSS_COMPOSITING)
@@ -195 +194 @@
     , m_textCombine(o.m_textCombine)
     , m_textDecorationStyle(o.m_textDecorationStyle)
-    , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
     , m_aspectRatioType(o.m_aspectRatioType)
 #if ENABLE(CSS_COMPOSITING)
@@ -304 +302 @@
         && m_scrollSnapType == o.m_scrollSnapType
 #endif
-        && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
 #if ENABLE(CSS_COMPOSITING)
         && m_effectiveBlendMode == o.m_effectiveBlendMode

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

@@ -208 +208 @@
     unsigned m_textDecorationStyle : 3; // TextDecorationStyle
 
-    unsigned m_runningAcceleratedAnimation : 1;
-
     unsigned m_aspectRatioType : 2;