Chromium Code Reviews| Index: Source/core/animation/AnimationTimelineTest.cpp |
| diff --git a/Source/core/animation/AnimationTimelineTest.cpp b/Source/core/animation/AnimationTimelineTest.cpp |
| index ecb532e589a6adde0577e0e6947ed096430943c8..f371ab234004dd67350d4f07fcf00d6a55507c67 100644 |
| --- a/Source/core/animation/AnimationTimelineTest.cpp |
| +++ b/Source/core/animation/AnimationTimelineTest.cpp |
| @@ -31,9 +31,9 @@ |
| #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" |
| @@ -139,7 +139,7 @@ TEST_F(AnimationAnimationTimelineTest, HasStarted) |
| TEST_F(AnimationAnimationTimelineTest, EmptyKeyframeAnimation) |
| { |
| RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()); |
| - RefPtrWillBeRawPtr<Animation> anim = Animation::create(element.get(), effect, timing); |
| + RefPtrWillBeRawPtr<KeyframeEffect> anim = KeyframeEffect::create(element.get(), effect, timing); |
|
alancutter (OOO until 2018)
2015/05/05 01:04:51
s/anim/keyframeEffect/g
dstockwell
2015/05/05 03:33:25
Done!!!!
|
| timeline->play(anim.get()); |
| @@ -157,7 +157,7 @@ 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> anim = KeyframeEffect::create(element.get(), effect, timing); |
| timeline->play(anim.get()); |
| @@ -346,10 +346,10 @@ 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* player1 = timeline->play(anim1.get()); |
| + Animation* player2 = timeline->play(anim2.get()); |
| timeline->pauseAnimationsForTesting(seekTime); |
| EXPECT_FLOAT_EQ(seekTime, player1->currentTime() / 1000.0); |
| @@ -361,7 +361,7 @@ TEST_F(AnimationAnimationTimelineTest, DelayBeforeAnimationStart) |
| timing.iterationDuration = 2; |
| timing.startDelay = 5; |
| - RefPtrWillBeRawPtr<Animation> anim = Animation::create(element.get(), nullptr, timing); |
| + RefPtrWillBeRawPtr<KeyframeEffect> anim = KeyframeEffect::create(element.get(), nullptr, timing); |
| timeline->play(anim.get()); |
| @@ -388,14 +388,14 @@ TEST_F(AnimationAnimationTimelineTest, PlayAfterDocumentDeref) |
| element = nullptr; |
| document = nullptr; |
| - RefPtrWillBeRawPtr<Animation> anim = Animation::create(0, nullptr, timing); |
| + RefPtrWillBeRawPtr<KeyframeEffect> anim = KeyframeEffect::create(0, nullptr, timing); |
| // Test passes if this does not crash. |
| timeline->play(anim.get()); |
| } |
| -TEST_F(AnimationAnimationTimelineTest, UseAnimationPlayerAfterTimelineDeref) |
| +TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref) |
| { |
| - RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->play(0); |
| + RefPtrWillBeRawPtr<Animation> player = timeline->play(0); |
|
alancutter (OOO until 2018)
2015/05/05 01:04:51
s/player/animation/
dstockwell
2015/05/05 03:33:25
DONE!
|
| timeline.clear(); |
| // Test passes if this does not crash. |
| player->setStartTime(0); |