| Index: third_party/WebKit/Source/core/animation/ElementAnimations.h
|
| diff --git a/third_party/WebKit/Source/core/animation/ElementAnimations.h b/third_party/WebKit/Source/core/animation/ElementAnimations.h
|
| index 40edcb9ac52c245ceb6f5bf897401352fbca67db..2fc53486a35544c1c9986f6b111cd6fa5645135f 100644
|
| --- a/third_party/WebKit/Source/core/animation/ElementAnimations.h
|
| +++ b/third_party/WebKit/Source/core/animation/ElementAnimations.h
|
| @@ -32,6 +32,7 @@
|
| #define ElementAnimations_h
|
|
|
| #include "core/animation/AnimationStack.h"
|
| +#include "core/animation/CustomCompositorAnimations.h"
|
| #include "core/animation/css/CSSAnimations.h"
|
| #include "wtf/HashCountedSet.h"
|
| #include "wtf/HashMap.h"
|
| @@ -54,6 +55,10 @@ public:
|
| // during a style recalc. CSS Transitions are included in this stack.
|
| AnimationStack& animationStack() { return m_animationStack; }
|
| const AnimationStack& animationStack() const { return m_animationStack; }
|
| + // Tracks long running animations that are responsible for applying mutations
|
| + // from compositor worker.
|
| + CustomCompositorAnimations& customCompositorAnimations() { return m_customCompositorAnimations; }
|
| + const CustomCompositorAnimations& customCompositorAnimations() const { return m_customCompositorAnimations; }
|
| // Tracks the state of active CSS Animations and Transitions. The individual animations
|
| // will also be part of the animation stack, but the mapping betwen animation name and
|
| // animation is kept here.
|
| @@ -80,6 +85,7 @@ private:
|
| bool isAnimationStyleChange() const;
|
|
|
| AnimationStack m_animationStack;
|
| + CustomCompositorAnimations m_customCompositorAnimations;
|
| CSSAnimations m_cssAnimations;
|
| AnimationCountedSet m_animations;
|
| bool m_animationStyleChange;
|
|
|