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

Unified Diff: sky/engine/core/animation/ActiveAnimations.cpp

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: CompositorPendingAnimations -> PendingAnimations Created 6 years 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
« no previous file with comments | « sky/engine/core/animation/ActiveAnimations.h ('k') | sky/engine/core/animation/Animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/ActiveAnimations.cpp
diff --git a/sky/engine/core/animation/ActiveAnimations.cpp b/sky/engine/core/animation/ActiveAnimations.cpp
index 2b3bde5a34056a7c37b65f6d756d86ac1cc38453..9ffc5d21b9c5edf618d3fcf958dde6d80db1c5d0 100644
--- a/sky/engine/core/animation/ActiveAnimations.cpp
+++ b/sky/engine/core/animation/ActiveAnimations.cpp
@@ -42,36 +42,4 @@ ActiveAnimations::~ActiveAnimations()
m_animations.clear();
}
-void ActiveAnimations::updateAnimationFlags(RenderStyle& style)
-{
- for (AnimationPlayerCountedSet::const_iterator it = m_players.begin(); it != m_players.end(); ++it) {
- const AnimationPlayer& player = *it->key;
- ASSERT(player.source());
- // FIXME: Needs to consider AnimationGroup once added.
- ASSERT(player.source()->isAnimation());
- const Animation& animation = *toAnimation(player.source());
- if (animation.isCurrent()) {
- if (animation.affects(CSSPropertyOpacity))
- style.setHasCurrentOpacityAnimation(true);
- if (animation.affects(CSSPropertyTransform))
- style.setHasCurrentTransformAnimation(true);
- if (animation.affects(CSSPropertyWebkitFilter))
- style.setHasCurrentFilterAnimation(true);
- }
- }
-
- if (style.hasCurrentOpacityAnimation())
- style.setIsRunningOpacityAnimationOnCompositor(m_defaultStack.hasActiveAnimationsOnCompositor(CSSPropertyOpacity));
- if (style.hasCurrentTransformAnimation())
- style.setIsRunningTransformAnimationOnCompositor(m_defaultStack.hasActiveAnimationsOnCompositor(CSSPropertyTransform));
- if (style.hasCurrentFilterAnimation())
- style.setIsRunningFilterAnimationOnCompositor(m_defaultStack.hasActiveAnimationsOnCompositor(CSSPropertyWebkitFilter));
-}
-
-void ActiveAnimations::cancelAnimationOnCompositor()
-{
- for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_players.end(); ++it)
- it->key->cancelAnimationOnCompositor();
-}
-
} // namespace blink
« no previous file with comments | « sky/engine/core/animation/ActiveAnimations.h ('k') | sky/engine/core/animation/Animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698