Web Animations: Refactor KeyframeEffectModel to work via an InterpolationEffect.

Source/core/animation/Animation.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 18 matching lines @@
  */
 
 #include "config.h"
 #include "core/animation/Animation.h"
 
 #include "bindings/v8/Dictionary.h"
 #include "core/animation/ActiveAnimations.h"
 #include "core/animation/AnimationHelpers.h"
 #include "core/animation/CompositorAnimations.h"
 #include "core/animation/DocumentTimeline.h"
+#include "core/animation/Interpolation.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/Player.h"
 #include "core/dom/Element.h"
 #include "core/rendering/RenderLayer.h"
 
 namespace WebCore {
 
 PassRefPtr<Animation> Animation::create(PassRefPtr<Element> target, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtr<EventDelegate> eventDelegate)
 {
     return adoptRef(new Animation(target, effect, timing, priority, eventDelegate));
@@ skipping 65 matching lines @@
         return;
 
     if (player() && !previouslyInEffect) {
         ensureAnimationStack(m_target.get()).add(this);
         m_activeInAnimationStack = true;
     }
 
     double iteration = currentIteration();
     ASSERT(iteration >= 0);
     // FIXME: Handle iteration values which overflow int.
-    m_compositableValues = m_effect->sample(static_cast<int>(iteration), timeFraction());
+    m_activeInterpolations = m_effect->sample(static_cast<int>(iteration), timeFraction());
     if (player())
         m_target->setNeedsAnimationStyleRecalc();
 }
 
 void Animation::clearEffects()
 {
     ASSERT(player());
     ASSERT(m_activeInAnimationStack);
     ensureAnimationStack(m_target.get()).remove(this);
 
     {
         // FIXME: clearEffects is called from withins style recalc.
         // This queries compositingState, which is not necessarily up to date.
         // https://code.google.com/p/chromium/issues/detail?id=339847
         DisableCompositingQueryAsserts disabler;
         cancelAnimationOnCompositor();
     }
 
     m_activeInAnimationStack = false;
-    m_compositableValues.clear();
+    m_activeInterpolations.clear();
     m_target->setNeedsAnimationStyleRecalc();
     invalidate();
 }
 
 void Animation::updateChildrenAndEffects() const
 {
     if (!m_effect)
         return;
     if (isInEffect())
         const_cast<Animation*>(this)->applyEffects(m_activeInAnimationStack);
@@ skipping 85 matching lines @@
 void Animation::pauseAnimationForTestingOnCompositor(double pauseTime)
 {
     ASSERT(hasActiveAnimationsOnCompositor());
     if (!m_target || !m_target->renderer())
         return;
     for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i)
         CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target.get(), m_compositorAnimationIds[i], pauseTime);
 }
 
 } // namespace WebCore