Web Animations: Update naming to reflect spec changes

Source/core/animation/AnimationTimelineTest.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 13 matching lines @@
  * 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/AnimationTimeline.h"
 
-#include "core/animation/Animation.h"
 #include "core/animation/AnimationClock.h"
-#include "core/animation/AnimationNode.h"
+#include "core/animation/AnimationEffect.h"
+#include "core/animation/KeyframeEffect.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/QualifiedName.h"
 #include "platform/weborigin/KURL.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace blink {
@@ skipping 85 matching lines @@
 };
 
 TEST_F(AnimationAnimationTimelineTest, HasStarted)
 {
     timeline = AnimationTimeline::create(document.get());
 }
 
 TEST_F(AnimationAnimationTimelineTest, EmptyKeyframeAnimation)
 {
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());
-    RefPtrWillBeRawPtr<Animation> anim = Animation::create(element.get(), effect, timing);
+    RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(element.get(), effect, timing);
 
-    timeline->play(anim.get());
+    timeline->play(keyframeEffect.get());
 
     platformTiming->expectNoMoreActions();
     updateClockAndService(0);
     EXPECT_FLOAT_EQ(0, timeline->currentTimeInternal());
-    EXPECT_FALSE(anim->isInEffect());
+    EXPECT_FALSE(keyframeEffect->isInEffect());
 
     platformTiming->expectNoMoreActions();
     updateClockAndService(100);
     EXPECT_FLOAT_EQ(100, timeline->currentTimeInternal());
 }
 
 TEST_F(AnimationAnimationTimelineTest, EmptyForwardsKeyframeAnimation)
 {
     RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());
     timing.fillMode = Timing::FillModeForwards;
-    RefPtrWillBeRawPtr<Animation> anim = Animation::create(element.get(), effect, timing);
+    RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(element.get(), effect, timing);
 
-    timeline->play(anim.get());
+    timeline->play(keyframeEffect.get());
 
     platformTiming->expectNoMoreActions();
     updateClockAndService(0);
     EXPECT_FLOAT_EQ(0, timeline->currentTimeInternal());
-    EXPECT_TRUE(anim->isInEffect());
+    EXPECT_TRUE(keyframeEffect->isInEffect());
 
     platformTiming->expectNoMoreActions();
     updateClockAndService(100);
     EXPECT_FLOAT_EQ(100, timeline->currentTimeInternal());
 }
 
 TEST_F(AnimationAnimationTimelineTest, ZeroTime)
 {
     timeline = AnimationTimeline::create(document.get());
     bool isNull;
@@ skipping 161 matching lines @@
 
     timeline->setCurrentTime(2000);
     EXPECT_EQ(2000, timeline->currentTime());
     EXPECT_EQ(zeroTime + 198, timeline->zeroTime());
 }
 
 TEST_F(AnimationAnimationTimelineTest, PauseForTesting)
 {
     float seekTime = 1;
     timing.fillMode = Timing::FillModeForwards;
-    RefPtrWillBeRawPtr<Animation> anim1 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing);
-    RefPtrWillBeRawPtr<Animation> anim2  = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing);
-    AnimationPlayer* player1 = timeline->play(anim1.get());
-    AnimationPlayer* player2 = timeline->play(anim2.get());
+    RefPtrWillBeRawPtr<KeyframeEffect> anim1 = KeyframeEffect::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing);
+    RefPtrWillBeRawPtr<KeyframeEffect> anim2  = KeyframeEffect::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing);
+    Animation* animation1 = timeline->play(anim1.get());
+    Animation* animation2 = timeline->play(anim2.get());
     timeline->pauseAnimationsForTesting(seekTime);
 
-    EXPECT_FLOAT_EQ(seekTime, player1->currentTime() / 1000.0);
-    EXPECT_FLOAT_EQ(seekTime, player2->currentTime() / 1000.0);
+    EXPECT_FLOAT_EQ(seekTime, animation1->currentTime() / 1000.0);
+    EXPECT_FLOAT_EQ(seekTime, animation2->currentTime() / 1000.0);
 }
 
 TEST_F(AnimationAnimationTimelineTest, DelayBeforeAnimationStart)
 {
     timing.iterationDuration = 2;
     timing.startDelay = 5;
 
-    RefPtrWillBeRawPtr<Animation> anim = Animation::create(element.get(), nullptr, timing);
+    RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(element.get(), nullptr, timing);
 
-    timeline->play(anim.get());
+    timeline->play(keyframeEffect.get());
 
-    // TODO: Put the player startTime in the future when we add the capability to change player startTime
+    // TODO: Put the animation startTime in the future when we add the capability to change animation startTime
     platformTiming->expectDelayedAction(timing.startDelay - minimumDelay());
     updateClockAndService(0);
 
     platformTiming->expectDelayedAction(timing.startDelay - minimumDelay() - 1.5);
     updateClockAndService(1.5);
 
     EXPECT_CALL(*platformTiming, serviceOnNextFrame());
     wake();
 
     platformTiming->expectNextFrameAction();
     updateClockAndService(4.98);
 }
 
 TEST_F(AnimationAnimationTimelineTest, PlayAfterDocumentDeref)
 {
     timing.iterationDuration = 2;
     timing.startDelay = 5;
 
     timeline = &document->timeline();
     element = nullptr;
     document = nullptr;
 
-    RefPtrWillBeRawPtr<Animation> anim = Animation::create(0, nullptr, timing);
+    RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(0, nullptr, timing);
     // Test passes if this does not crash.
-    timeline->play(anim.get());
+    timeline->play(keyframeEffect.get());
 }
 
-TEST_F(AnimationAnimationTimelineTest, UseAnimationPlayerAfterTimelineDeref)
+TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref)
 {
-    RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->play(0);
+    RefPtrWillBeRawPtr<Animation> animation = timeline->play(0);
     timeline.clear();
     // Test passes if this does not crash.
-    player->setStartTime(0);
+    animation->setStartTime(0);
 }
 
 }