| Index: Source/core/animation/Animation.h
|
| diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h
|
| index 0940b3fe6e246c3325a070cd8a066871dfd18249..1fa6e4fb261e119ccb68c6f86738af9648ae8a14 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,15 @@ 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 Element* = 0, CSSPropertyID = CSSPropertyInvalid) const;
|
| + void cancelCompositorAnimations();
|
| +
|
| protected:
|
| // Returns whether style recalc was triggered.
|
| virtual bool applyEffects(bool previouslyInEffect);
|
| @@ -74,8 +81,16 @@ private:
|
| OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues;
|
|
|
| Priority m_priority;
|
| +
|
| + Vector<int> m_acceleratedAnimationIds;
|
| };
|
|
|
| +inline Animation* toAnimation(TimedItem* timedItem)
|
| +{
|
| + ASSERT_WITH_SECURITY_IMPLICATION(timedItem && timedItem->isAnimation());
|
| + return static_cast<Animation*>(timedItem);
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|
| #endif
|
|
|