Revert "Web Animations: Introduce String based KeyframeEffectModel"

Source/core/animation/AnimationStackTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/animation/AnimationStack.h"
 
 #include "core/animation/ActiveAnimations.h"
 #include "core/animation/AnimatableDouble.h"
 #include "core/animation/AnimationClock.h"
@@ skipping 19 matching lines @@
     AnimationPlayer* play(Animation* animation, double startTime)
     {
         AnimationPlayer* player = timeline->createAnimationPlayer(animation);
         player->setStartTime(startTime);
         player->update();
         return player;
     }
 
     PassRefPtrWillBeRawPtr<AnimationEffect> makeAnimationEffect(CSSPropertyID id, PassRefPtrWillBeRawPtr<AnimatableValue> value)
     {
-        AnimatableValueKeyframeVector keyframes(2);
-        keyframes[0] = AnimatableValueKeyframe::create();
+        KeyframeEffectModel::KeyframeVector keyframes(2);
+        keyframes[0] = Keyframe::create();
         keyframes[0]->setOffset(0.0);
         keyframes[0]->setPropertyValue(id, value.get());
-        keyframes[1] = AnimatableValueKeyframe::create();
+        keyframes[1] = Keyframe::create();
         keyframes[1]->setOffset(1.0);
         keyframes[1]->setPropertyValue(id, value.get());
-        return AnimatableValueKeyframeEffectModel::create(keyframes);
+        return KeyframeEffectModel::create(keyframes);
     }
 
     PassRefPtr<InertAnimation> makeInertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect)
     {
         Timing timing;
         timing.fillMode = Timing::FillModeBoth;
         return InertAnimation::create(effect, timing, false);
     }
 
     PassRefPtr<Animation> makeAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect)
     {
         Timing timing;
         timing.fillMode = Timing::FillModeBoth;
         return Animation::create(element, effect, timing);
     }
 
     AnimatableValue* interpolationValue(Interpolation* interpolation)
     {
-        return toLegacyStyleInterpolation(interpolation)->currentValue().get();
+        return toLegacyStyleInterpolation(interpolation)->currentValue();
     }
 
     RefPtr<Document> document;
     RefPtr<DocumentTimeline> timeline;
     RefPtr<Element> element;
 };
 
 TEST_F(AnimationAnimationStackTest, ActiveAnimationsSorted)
 {
     play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 10);
@@ skipping 23 matching lines @@
 {
     HashSet<const AnimationPlayer*> cancelledAnimationPlayers;
     cancelledAnimationPlayers.add(play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 0));
     play(makeAnimation(makeAnimationEffect(CSSPropertyZIndex, AnimatableDouble::create(2))).get(), 0);
     WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, &cancelledAnimationPlayers, Animation::DefaultPriority, 0);
     EXPECT_EQ(1u, result.size());
     EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex))->equals(AnimatableDouble::create(2).get()));
 }
 
 }