Chromium Code Reviews| 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 af5b499acaa7093317be5032fb0262db7f352c82..9262a989fd8c392e8ae8cf8c24957c20edbc14a0 100644 |
| --- a/third_party/WebKit/Source/core/animation/ElementAnimations.h |
| +++ b/third_party/WebKit/Source/core/animation/ElementAnimations.h |
| @@ -31,8 +31,8 @@ |
| #ifndef ElementAnimations_h |
| #define ElementAnimations_h |
| -#include "core/animation/AnimationStack.h" |
| #include "core/animation/CustomCompositorAnimations.h" |
| +#include "core/animation/EffectStack.h" |
| #include "core/animation/css/CSSAnimations.h" |
| #include "wtf/HashCountedSet.h" |
| #include "wtf/HashMap.h" |
| @@ -55,8 +55,8 @@ class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> { |
| // Animations that are currently active for this element, their effects will |
| // be applied during a style recalc. CSS Transitions are included in this |
| // stack. |
| - AnimationStack& animationStack() { return m_animationStack; } |
| - const AnimationStack& animationStack() const { return m_animationStack; } |
| + EffectStack& animationStack() { return m_animationStack; } |
|
loyso (OOO)
2016/11/22 05:46:17
Hmm. We need to rename this method/data as well.
loyso (OOO)
2016/11/22 05:58:23
Done.
|
| + const EffectStack& animationStack() const { return m_animationStack; } |
| // Tracks long running animations that are responsible for applying mutations |
| // from compositor worker. |
| CustomCompositorAnimations& customCompositorAnimations() { |
| @@ -95,7 +95,7 @@ class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> { |
| private: |
| bool isAnimationStyleChange() const; |
| - AnimationStack m_animationStack; |
| + EffectStack m_animationStack; |
| CustomCompositorAnimations m_customCompositorAnimations; |
| CSSAnimations m_cssAnimations; |
| AnimationCountedSet m_animations; |