Index: Source/core/animation/ActiveAnimations.cpp |
diff --git a/Source/core/animation/ActiveAnimations.cpp b/Source/core/animation/ActiveAnimations.cpp |
index d3c1189da2fd76a307c6528a6b80db7bb3c854b5..5e450b6d4ce53338a9354677ad157d97eca8995d 100644 |
--- a/Source/core/animation/ActiveAnimations.cpp |
+++ b/Source/core/animation/ActiveAnimations.cpp |
@@ -38,11 +38,11 @@ namespace WebCore { |
void ActiveAnimations::updateAnimationFlags(RenderStyle& style) |
{ |
for (AnimationPlayerSet::const_iterator it = m_players.begin(); it != players().end(); ++it) { |
- const AnimationPlayer& player = *it->key; |
- ASSERT(player.source()); |
+ AnimationPlayer* player = *it; |
+ ASSERT(player->source()); |
// FIXME: Needs to consider AnimationGroup once added. |
- ASSERT(player.source()->isAnimation()); |
- const Animation& animation = *toAnimation(player.source()); |
+ ASSERT(player->source()->isAnimation()); |
+ const Animation& animation = *toAnimation(player->source()); |
if (animation.isCurrent()) { |
if (animation.affects(CSSPropertyOpacity)) |
style.setHasCurrentOpacityAnimation(true); |
@@ -64,12 +64,14 @@ void ActiveAnimations::updateAnimationFlags(RenderStyle& style) |
void ActiveAnimations::cancelAnimationOnCompositor() |
{ |
for (AnimationPlayerSet::iterator it = m_players.begin(); it != players().end(); ++it) |
- it->key->cancelAnimationOnCompositor(); |
+ (*it)->cancelAnimationOnCompositor(); |
} |
void ActiveAnimations::trace(Visitor* visitor) |
{ |
visitor->trace(m_cssAnimations); |
+ visitor->trace(m_defaultStack); |
+ visitor->trace(m_players); |
} |
} // namespace WebCore |