diff options
Diffstat (limited to 'WebCore/page/animation/AnimationBase.h')
| -rw-r--r-- | WebCore/page/animation/AnimationBase.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebCore/page/animation/AnimationBase.h b/WebCore/page/animation/AnimationBase.h index 91ef8cf..9bdca3a 100644 --- a/WebCore/page/animation/AnimationBase.h +++ b/WebCore/page/animation/AnimationBase.h @@ -144,9 +144,10 @@ public: // Does this animation/transition involve the given property? virtual bool affectsProperty(int /*property*/) const { return false; } - bool isAnimatingProperty(int property, bool isRunningNow) const + + bool isAnimatingProperty(int property, bool acceleratedOnly, bool isRunningNow) const { - if (m_fallbackAnimating) + if (acceleratedOnly && !m_isAccelerated) return false; if (isRunningNow) @@ -197,7 +198,7 @@ protected: void goIntoEndingOrLoopingState(); - bool isFallbackAnimating() const { return m_fallbackAnimating; } + bool isAccelerated() const { return m_isAccelerated; } static bool propertiesEqual(int prop, const RenderStyle* a, const RenderStyle* b); static int getPropertyAtIndex(int, bool& isShorthand); @@ -220,7 +221,7 @@ protected: RefPtr<Animation> m_animation; CompositeAnimation* m_compAnim; - bool m_fallbackAnimating; // true when animating an accelerated property but have to fall back to software + bool m_isAccelerated; bool m_transformFunctionListValid; double m_totalDuration, m_nextIterationDuration; |