| Index: trunk/Source/core/page/animation/CompositeAnimation.cpp
|
| ===================================================================
|
| --- trunk/Source/core/page/animation/CompositeAnimation.cpp (revision 153372)
|
| +++ trunk/Source/core/page/animation/CompositeAnimation.cpp (working copy)
|
| @@ -254,7 +254,7 @@
|
| }
|
|
|
| // Make a list of animations to be removed.
|
| - Vector<StringImpl*> animsToBeRemoved;
|
| + Vector<AtomicStringImpl*> animsToBeRemoved;
|
| kfend = m_keyframeAnimations.end();
|
| for (AnimationNameMap::const_iterator it = m_keyframeAnimations.begin(); it != kfend; ++it) {
|
| KeyframeAnimation* keyframeAnim = it->value.get();
|
| @@ -293,7 +293,7 @@
|
|
|
| // Now that we have animation objects ready, let them know about the new goal state. We want them
|
| // to fill in a RenderStyle*& only if needed.
|
| - for (Vector<StringImpl*>::const_iterator it = m_keyframeAnimationOrderMap.begin(); it != m_keyframeAnimationOrderMap.end(); ++it) {
|
| + for (Vector<AtomicStringImpl*>::const_iterator it = m_keyframeAnimationOrderMap.begin(); it != m_keyframeAnimationOrderMap.end(); ++it) {
|
| RefPtr<KeyframeAnimation> keyframeAnim = m_keyframeAnimations.get(*it);
|
| if (keyframeAnim)
|
| keyframeAnim->animate(this, renderer, currentStyle, targetStyle, resultStyle);
|
| @@ -313,7 +313,7 @@
|
|
|
| m_keyframeAnimations.checkConsistency();
|
|
|
| - for (Vector<StringImpl*>::const_iterator it = m_keyframeAnimationOrderMap.begin(); it != m_keyframeAnimationOrderMap.end(); ++it) {
|
| + for (Vector<AtomicStringImpl*>::const_iterator it = m_keyframeAnimationOrderMap.begin(); it != m_keyframeAnimationOrderMap.end(); ++it) {
|
| RefPtr<KeyframeAnimation> keyframeAnimation = m_keyframeAnimations.get(*it);
|
| if (keyframeAnimation)
|
| keyframeAnimation->getAnimatedStyle(resultStyle);
|
|
|