Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: third_party/WebKit/Source/core/animation/ElementAnimations.h

Issue 2522823002: Blink Animation: Rename AnimationStack to EffectStack. (Closed)
Patch Set: Rename getter and data (and locals) Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..5c018120d80d2c04dc05f7bdc90cd8fa2081f3e5 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& effectStack() { return m_effectStack; }
+ const EffectStack& effectStack() const { return m_effectStack; }
// Tracks long running animations that are responsible for applying mutations
// from compositor worker.
CustomCompositorAnimations& customCompositorAnimations() {
@@ -75,7 +75,7 @@ class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> {
AnimationCountedSet& animations() { return m_animations; }
bool isEmpty() const {
- return m_animationStack.isEmpty() && m_cssAnimations.isEmpty() &&
+ return m_effectStack.isEmpty() && m_cssAnimations.isEmpty() &&
m_animations.isEmpty();
}
@@ -95,7 +95,7 @@ class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> {
private:
bool isAnimationStyleChange() const;
- AnimationStack m_animationStack;
+ EffectStack m_effectStack;
CustomCompositorAnimations m_customCompositorAnimations;
CSSAnimations m_cssAnimations;
AnimationCountedSet m_animations;

Powered by Google App Engine
This is Rietveld 408576698