[wip] interpolable value refactor. NOT FOR LANDING.

Source/core/css/resolver/StyleResolver.cpp

Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index abd3517b283415004c512f07fd016cef5c6b7606..af8d8f3f6280af02f9c8eb39938837ecb9547a49 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -1150,8 +1150,8 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, Element*
     if (!state.animationUpdate())
         return;
 
-    const AnimationEffect::CompositableValueMap& compositableValuesForAnimations = state.animationUpdate()->compositableValuesForAnimations();
-    const AnimationEffect::CompositableValueMap& compositableValuesForTransitions = state.animationUpdate()->compositableValuesForTransitions();
+    const HashMap<CSSPropertyID, RefPtr<Interpolation> >& compositableValuesForAnimations = state.animationUpdate()->compositableValuesForAnimations();
+    const HashMap<CSSPropertyID, RefPtr<Interpolation> >& compositableValuesForTransitions = state.animationUpdate()->compositableValuesForTransitions();
     applyAnimatedProperties<HighPriorityProperties>(state, compositableValuesForAnimations);
     applyAnimatedProperties<HighPriorityProperties>(state, compositableValuesForTransitions);
     applyAnimatedProperties<LowPriorityProperties>(state, compositableValuesForAnimations);
@@ -1166,19 +1166,18 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, Element*
 }
 
 template <StyleResolver::StyleApplicationPass pass>
-void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const AnimationEffect::CompositableValueMap& compositableValues)
+void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const HashMap<CSSPropertyID, RefPtr<Interpolation> >& compositableValues)
 {
     ASSERT(RuntimeEnabledFeatures::webAnimationsCSSEnabled());
     ASSERT(pass != VariableDefinitions);
     ASSERT(pass != AnimationProperties);
 
-    for (AnimationEffect::CompositableValueMap::const_iterator iter = compositableValues.begin(); iter != compositableValues.end(); ++iter) {
+    for (HashMap<CSSPropertyID, RefPtr<Interpolation> >::const_iterator iter = compositableValues.begin(); iter != compositableValues.end(); ++iter) {
         CSSPropertyID property = iter->key;
         if (!isPropertyForPass<pass>(property))
             continue;
-        ASSERT_WITH_MESSAGE(!iter->value->dependsOnUnderlyingValue(), "Web Animations not yet implemented: An interface for compositing onto the underlying value.");
-        RefPtr<AnimatableValue> animatableValue = iter->value->compositeOnto(0);
-        AnimatedStyleBuilder::applyProperty(property, state, animatableValue.get());
+        const StyleInterpolation *interpolation = static_cast<const StyleInterpolation *>(iter->value.get());
+        interpolation->apply(state);
     }
 }