Chromium Code Reviews| Index: Source/core/animation/ActiveAnimations.cpp |
| diff --git a/Source/core/animation/ActiveAnimations.cpp b/Source/core/animation/ActiveAnimations.cpp |
| index 317722af295e12a085355f33bfe410d3fefb7cdf..0f530a0e8de3f096dc5734d57530da6d34dde770 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 |
|
shans
2014/03/17 04:03:47
This name is no longer correct.
dstockwell
2014/03/17 04:16:34
FIXME, I think we'll want to consider renaming mos
|
| { |
| - return m_defaultStack.affects(property); |
| + for (PlayerSet::const_iterator it = m_players.begin(); it != players().end(); ++it) { |
| + const Player& 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; |
|
shans
2014/03/17 04:03:47
Can m_defaultStack reflect animations that are pen
dstockwell
2014/03/17 04:16:34
Possibly, or perhaps we should create a separate c
|
| } |
| bool ActiveAnimations::hasActiveAnimationsOnCompositor(CSSPropertyID property) const |