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

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

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.cpp
diff --git a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
index a3d309d024649b5aa876301d2cc4cb1dcbdf5325..894dfdec8bcef6ba650de60dd0df2d8ab5238ab1 100644
--- a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
+++ b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
@@ -59,19 +59,23 @@ void ElementAnimations::updateAnimationFlags(ComputedStyle& style) {
}
}
- if (style.hasCurrentOpacityAnimation())
+ if (style.hasCurrentOpacityAnimation()) {
style.setIsRunningOpacityAnimationOnCompositor(
- m_animationStack.hasActiveAnimationsOnCompositor(CSSPropertyOpacity));
- if (style.hasCurrentTransformAnimation())
+ m_effectStack.hasActiveAnimationsOnCompositor(CSSPropertyOpacity));
+ }
+ if (style.hasCurrentTransformAnimation()) {
style.setIsRunningTransformAnimationOnCompositor(
- m_animationStack.hasActiveAnimationsOnCompositor(CSSPropertyTransform));
- if (style.hasCurrentFilterAnimation())
+ m_effectStack.hasActiveAnimationsOnCompositor(CSSPropertyTransform));
+ }
+ if (style.hasCurrentFilterAnimation()) {
style.setIsRunningFilterAnimationOnCompositor(
- m_animationStack.hasActiveAnimationsOnCompositor(CSSPropertyFilter));
- if (style.hasCurrentBackdropFilterAnimation())
+ m_effectStack.hasActiveAnimationsOnCompositor(CSSPropertyFilter));
+ }
+ if (style.hasCurrentBackdropFilterAnimation()) {
style.setIsRunningBackdropFilterAnimationOnCompositor(
- m_animationStack.hasActiveAnimationsOnCompositor(
+ m_effectStack.hasActiveAnimationsOnCompositor(
CSSPropertyBackdropFilter));
+ }
}
void ElementAnimations::restartAnimationOnCompositor() {
@@ -82,7 +86,7 @@ void ElementAnimations::restartAnimationOnCompositor() {
DEFINE_TRACE(ElementAnimations) {
visitor->trace(m_cssAnimations);
visitor->trace(m_customCompositorAnimations);
- visitor->trace(m_animationStack);
+ visitor->trace(m_effectStack);
visitor->trace(m_animations);
}

Powered by Google App Engine
This is Rietveld 408576698