Index: Source/core/animation/AnimationStack.cpp |
diff --git a/Source/core/animation/AnimationStack.cpp b/Source/core/animation/AnimationStack.cpp |
index 601e7e598e4d4ccb17ba4d8e76841adbd84d1cce..a7fdd5634a25f41b1a3268adb83b13756c905ecf 100644 |
--- a/Source/core/animation/AnimationStack.cpp |
+++ b/Source/core/animation/AnimationStack.cpp |
@@ -30,6 +30,7 @@ |
#include "config.h" |
#include "core/animation/AnimationStack.h" |
+#include "core/animation/Interpolation.h" |
#include "core/animation/css/CSSAnimations.h" |
@@ -37,12 +38,15 @@ namespace WebCore { |
namespace { |
-void copyToCompositableValueMap(const AnimationEffect::CompositableValueList* source, AnimationEffect::CompositableValueMap& target) |
+void copyToCompositableValueMap(const Vector<RefPtr<WebCore::Interpolation> > * source, HashMap<CSSPropertyID, RefPtr<WebCore::Interpolation> >& target) |
{ |
if (!source) |
return; |
- for (AnimationEffect::CompositableValueList::const_iterator iter = source->begin(); iter != source->end(); ++iter) |
- target.set(iter->first, iter->second); |
+ for (Vector<RefPtr<WebCore::Interpolation> >::const_iterator iter = source->begin(); iter != source->end(); ++iter) { |
+ RefPtr<WebCore::Interpolation> interpolation = *iter; |
+ WebCore::StyleInterpolation *styleInterpolation = static_cast<WebCore::StyleInterpolation *>(interpolation.get()); |
+ target.set(styleInterpolation->id(), styleInterpolation); |
+ } |
} |
} // namespace |
@@ -65,9 +69,9 @@ bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) con |
return false; |
} |
-AnimationEffect::CompositableValueMap AnimationStack::compositableValues(const AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const Player*>* cancelledPlayers, Animation::Priority priority) |
+HashMap<CSSPropertyID, RefPtr<Interpolation> > AnimationStack::compositableValues(const AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const Player*>* cancelledPlayers, Animation::Priority priority) |
{ |
- AnimationEffect::CompositableValueMap result; |
+ HashMap<CSSPropertyID, RefPtr<Interpolation> > result; |
if (animationStack) { |
const Vector<Animation*>& animations = animationStack->m_activeAnimations; |