Web Animations: Refactor KeyframeEffectModel to work via an InterpolationEffect.

Source/core/animation/AnimationStack.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/animation/AnimationStack.h"
+#include "core/animation/Interpolation.h"
 
 #include "core/animation/css/CSSAnimations.h"
 
 namespace WebCore {
 
 namespace {
 
-void copyToCompositableValueMap(const AnimationEffect::CompositableValueList* source, AnimationEffect::CompositableValueMap& target)
+void copyToActiveInterpolationMap(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 = toStyleInterpolation(interpolation.get());
+        target.set(styleInterpolation->id(), styleInterpolation);
+    }
 }
 
 } // namespace
 
 bool AnimationStack::affects(CSSPropertyID property) const
 {
     for (size_t i = 0; i < m_activeAnimations.size(); ++i) {
         if (m_activeAnimations[i]->affects(property))
             return true;
     }
     return false;
 }
 
 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
 {
     for (size_t i = 0; i < m_activeAnimations.size(); ++i) {
         if (m_activeAnimations[i]->hasActiveAnimationsOnCompositor(property))
             return true;
     }
     return false;
 }
 
-AnimationEffect::CompositableValueMap AnimationStack::compositableValues(const AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const AnimationPlayer*>* cancelledAnimationPlayers, Animation::Priority priority)
+HashMap<CSSPropertyID, RefPtr<Interpolation> > AnimationStack::activeInterpolations(const AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const AnimationPlayer*>* cancelledAnimationPlayers, Animation::Priority priority)
 {
-    AnimationEffect::CompositableValueMap result;
+    HashMap<CSSPropertyID, RefPtr<Interpolation> > result;
 
     if (animationStack) {
         const Vector<Animation*>& animations = animationStack->m_activeAnimations;
         for (size_t i = 0; i < animations.size(); ++i) {
             Animation* animation = animations[i];
             if (animation->priority() != priority)
                 continue;
             if (cancelledAnimationPlayers && cancelledAnimationPlayers->contains(animation->player()))
                 continue;
-            copyToCompositableValueMap(animation->compositableValues(), result);
+            copyToActiveInterpolationMap(animation->activeInterpolations(), result);
         }
     }
 
     if (newAnimations) {
-        for (size_t i = 0; i < newAnimations->size(); ++i)
-            copyToCompositableValueMap(newAnimations->at(i)->sample().get(), result);
+        for (size_t i = 0; i < newAnimations->size(); ++i) {
+            OwnPtr<Vector<RefPtr<Interpolation> > > sample = newAnimations->at(i)->sample();
+            if (sample) {
+                copyToActiveInterpolationMap(*sample, result);
+            }
+        }
     }
 
     return result;
 }
 
 } // namespace WebCore