Chromium Code Reviews| Index: Source/core/animation/Animation.h | 
| diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h | 
| index 0940b3fe6e246c3325a070cd8a066871dfd18249..66952b5626f6ea2086607fac4aad53bc664e1f8b 100644 | 
| --- a/Source/core/animation/Animation.h | 
| +++ b/Source/core/animation/Animation.h | 
| @@ -45,6 +45,7 @@ public: | 
| enum Priority { DefaultPriority, TransitionPriority }; | 
| static PassRefPtr<Animation> create(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&, Priority = DefaultPriority, PassOwnPtr<EventDelegate> = nullptr); | 
| + virtual bool isAnimation() OVERRIDE FINAL { return true; } | 
| const AnimationEffect::CompositableValueMap* compositableValues() const | 
| { | 
| @@ -52,9 +53,16 @@ public: | 
| return m_compositableValues.get(); | 
| } | 
| + bool affects(CSSPropertyID property) const; | 
| const AnimationEffect* effect() const { return m_effect.get(); } | 
| Priority priority() const { return m_priority; } | 
| + bool isCandidateForCompositorAnimation() const; | 
| + bool startCompositorAnimations(); | 
| + bool isRunningCompositorAnimation() const; | 
| + bool isRunningCompositorAnimation(CSSPropertyID) const; | 
| + void cancelCompositorAnimations(); | 
| 
 
Steve Block
2013/11/18 05:03:03
The use of 'Animation' here seems awkward given th
 
dstockwell
2013/11/18 06:11:20
I've made everything plural for now.
 
 | 
| + | 
| protected: | 
| // Returns whether style recalc was triggered. | 
| virtual bool applyEffects(bool previouslyInEffect); | 
| @@ -74,8 +82,16 @@ private: | 
| OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues; | 
| Priority m_priority; | 
| + | 
| + Vector<int> m_acceleratedAnimationIds; | 
| 
 
Steve Block
2013/11/18 05:03:03
We should be consistent with naming: 'compositorAn
 
dstockwell
2013/11/18 06:11:20
Done.
 
 | 
| }; | 
| +inline Animation* toAnimation(TimedItem* timedItem) | 
| +{ | 
| + ASSERT_WITH_SECURITY_IMPLICATION(timedItem && timedItem->isAnimation()); | 
| + return static_cast<Animation*>(timedItem); | 
| +} | 
| + | 
| } // namespace WebCore | 
| #endif |