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 |