Changeset 141314 in webkit

Timestamp:

Jan 30, 2013 2:32:30 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Remove unnecessary setAnimating() method
​https://bugs.webkit.org/show_bug.cgi?id=107495

Patch by Douglas Stockwell <​dstockwell@chromium.org> on 2013-01-30
Reviewed by Dean Jackson.

The corresponding accessor and uses were removed in r39211.

No new tests: no change in behaviour.

• page/animation/AnimationBase.cpp:

(WebCore::AnimationBase::AnimationBase):

• page/animation/AnimationBase.h:

(AnimationBase):

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

(WebCore::ImplicitAnimation::animate):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::animate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/AnimationBase.cpp (modified) (1 diff)
• page/animation/AnimationBase.h (modified) (2 diffs)
• page/animation/CompositeAnimation.cpp (modified) (1 diff)
• page/animation/CompositeAnimation.h (modified) (1 diff)
• page/animation/ImplicitAnimation.cpp (modified) (2 diffs)
• page/animation/KeyframeAnimation.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Douglas Stockwell  <dstockwell@chromium.org>
+
+        Remove unnecessary setAnimating() method
+        https://bugs.webkit.org/show_bug.cgi?id=107495
+
+        Reviewed by Dean Jackson.
+
+        The corresponding accessor and uses were removed in r39211.
+
+        No new tests: no change in behaviour.
+
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::AnimationBase):
+        * page/animation/AnimationBase.h:
+        (AnimationBase):
+        * page/animation/CompositeAnimation.cpp:
+        * page/animation/CompositeAnimation.h:
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::animate):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::animate):
+
 2013-01-30  Elliott Sprehn  <esprehn@chromium.org>
 

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

@@ -71 +71 @@
 AnimationBase::AnimationBase(const Animation* transition, RenderObject* renderer, CompositeAnimation* compAnim)
     : m_animState(AnimationStateNew)
-    , m_isAnimating(false)
     , m_isAccelerated(false)
     , m_transformFunctionListValid(false)

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

@@ -130 +130 @@
     bool waitingForStyleAvailable() const { return m_animState == AnimationStateStartWaitStyleAvailable; }
 
-    // "animating" means that something is running that requires a timer to keep firing
-    // (e.g. a software animation)
-    void setAnimating(bool inAnimating = true) { m_isAnimating = inAnimating; }
     virtual double timeToNextService();
 
@@ -225 +222 @@
     AnimState m_animState;
 
-    bool m_isAnimating;       // transition/animation requires continual timer firing
     bool m_isAccelerated;
     bool m_transformFunctionListValid;

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

@@ -326 +326 @@
 }
 
-// "animating" means that something is running that requires the timer to keep firing
-void CompositeAnimation::setAnimating(bool animating)
-{
-    if (!m_transitions.isEmpty()) {
-        CSSPropertyTransitionsMap::const_iterator transitionsEnd = m_transitions.end();
-        for (CSSPropertyTransitionsMap::const_iterator it = m_transitions.begin(); it != transitionsEnd; ++it) {
-            ImplicitAnimation* transition = it->value.get();
-            transition->setAnimating(animating);
-        }
-    }
-    if (!m_keyframeAnimations.isEmpty()) {
-        m_keyframeAnimations.checkConsistency();
-        AnimationNameMap::const_iterator animationsEnd = m_keyframeAnimations.end();
-        for (AnimationNameMap::const_iterator it = m_keyframeAnimations.begin(); it != animationsEnd; ++it) {
-            KeyframeAnimation* anim = it->value.get();
-            anim->setAnimating(animating);
-        }
-    }
-}
-
 double CompositeAnimation::timeToNextService() const
 {

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

@@ -69 +69 @@
     bool hasAnimations() const  { return !m_transitions.isEmpty() || !m_keyframeAnimations.isEmpty(); }
 
-    void setAnimating(bool);
     bool isAnimatingProperty(CSSPropertyID, bool acceleratedOnly, bool isRunningNow) const;
 

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

@@ -82 +82 @@
     // 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)
-        setAnimating();
-    else {
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(ACCELERATED_COMPOSITING)
+    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
@@ -92 +90 @@
         animatedStyle->setIsRunningAcceleratedAnimation();
 #endif
-    }
 
     // Fire the start timeout if needed

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

@@ -188 +188 @@
     
         bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress);
-        if (needsAnim)
-            setAnimating();
-        else {
 #if USE(ACCELERATED_COMPOSITING)
+        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
@@ -197 +195 @@
             animatedStyle->setIsRunningAcceleratedAnimation();
 #endif
-        }
     }
 }