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

Unified Diff: Source/core/animation/ActiveAnimations.cpp

Issue 189883003: Web Animations: Allow animations with delay to start on compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Relax assert. Created 6 years, 9 months 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 | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/animation/AnimationPlayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ActiveAnimations.cpp
diff --git a/Source/core/animation/ActiveAnimations.cpp b/Source/core/animation/ActiveAnimations.cpp
index c0c06e9c6e86b1c4d0f48479451ce95e97a9b378..ec48cb6b87b5545e084e3003325fdbce29eff403 100644
--- a/Source/core/animation/ActiveAnimations.cpp
+++ b/Source/core/animation/ActiveAnimations.cpp
@@ -77,7 +77,16 @@ bool hasActiveAnimationsOnCompositor(const RenderObject& renderer, CSSPropertyID
bool ActiveAnimations::hasActiveAnimations(CSSPropertyID property) const
{
- return m_defaultStack.affects(property);
+ for (AnimationPlayerSet::const_iterator it = m_players.begin(); it != 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() && animation.affects(property))
+ return true;
+ }
+ return false;
}
bool ActiveAnimations::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/animation/AnimationPlayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698