Chromium Code Reviews| Index: Source/core/animation/ActiveAnimations.h | 
| diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/ActiveAnimations.h | 
| index 58d4287950208736e5283db10df02fb113d18fca..1fc81d168db79d529a03a017ca7b266eb18d4d07 100644 | 
| --- a/Source/core/animation/ActiveAnimations.h | 
| +++ b/Source/core/animation/ActiveAnimations.h | 
| @@ -40,6 +40,14 @@ | 
| namespace WebCore { | 
| +class RenderObject; | 
| +class Element; | 
| + | 
| +// FIXME: Move these to CompositorAnimations | 
| +bool isRunningAnimation(const RenderObject&, CSSPropertyID); | 
| +bool isRunningCompositorAnimation(const RenderObject&, CSSPropertyID); | 
| +bool shouldCompositeForAnimation(const RenderObject&, bool inCompositingMode); | 
| 
 
Steve Block
2013/11/18 05:03:03
Ordering in .h and .cpp should match
 
dstockwell
2013/11/18 06:11:20
Done.
 
 | 
| + | 
| class ActiveAnimations { | 
| public: | 
| // Animations that are currently active for this element, their effects will be applied | 
| @@ -49,6 +57,7 @@ public: | 
| // will also be part of the default stack, but the mapping betwen animation name and | 
| // player is kept here. | 
| CSSAnimations& cssAnimations() { return m_cssAnimations; } | 
| + const CSSAnimations& cssAnimations() const { return m_cssAnimations; } | 
| typedef HashCountedSet<Player*> PlayerSet; | 
| // Players which have animations targeting this element. | 
| @@ -56,6 +65,11 @@ public: | 
| PlayerSet& players() { return m_players; } | 
| bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.isEmpty(); } | 
| + | 
| + bool isRunningAnimation(CSSPropertyID) const; | 
| + bool isRunningCompositorAnimation(CSSPropertyID) const; | 
| + void cancelCompositorAnimations(); | 
| + | 
| private: | 
| AnimationStack m_defaultStack; | 
| CSSAnimations m_cssAnimations; |