Index: Source/core/animation/DocumentTimelineTest.cpp |
diff --git a/Source/core/animation/DocumentTimelineTest.cpp b/Source/core/animation/DocumentTimelineTest.cpp |
index 2f6f62cb305443aa8af71e66c79400f856bf89d4..2710ce293b6df891b0a9b027bb44aa55a4e410a6 100644 |
--- a/Source/core/animation/DocumentTimelineTest.cpp |
+++ b/Source/core/animation/DocumentTimelineTest.cpp |
@@ -132,7 +132,7 @@ TEST_F(AnimationDocumentTimelineTest, HasStarted) |
TEST_F(AnimationDocumentTimelineTest, EmptyKeyframeAnimation) |
{ |
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()); |
+ RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()); |
RefPtr<Animation> anim = Animation::create(element.get(), effect, timing); |
timeline->play(anim.get()); |
@@ -149,7 +149,7 @@ TEST_F(AnimationDocumentTimelineTest, EmptyKeyframeAnimation) |
TEST_F(AnimationDocumentTimelineTest, EmptyForwardsKeyframeAnimation) |
{ |
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()); |
+ RefPtrWillBeRawPtr<KeyframeEffectModel> effect = KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()); |
timing.fillMode = Timing::FillModeForwards; |
RefPtr<Animation> anim = Animation::create(element.get(), effect, timing); |
@@ -193,8 +193,8 @@ TEST_F(AnimationDocumentTimelineTest, PauseForTesting) |
{ |
float seekTime = 1; |
timing.fillMode = Timing::FillModeForwards; |
- RefPtr<Animation> anim1 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing); |
- RefPtr<Animation> anim2 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing); |
+ RefPtr<Animation> anim1 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timing); |
+ RefPtr<Animation> anim2 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timing); |
AnimationPlayer* player1 = timeline->play(anim1.get()); |
AnimationPlayer* player2 = timeline->play(anim2.get()); |
timeline->pauseAnimationsForTesting(seekTime); |
@@ -226,11 +226,11 @@ TEST_F(AnimationDocumentTimelineTest, NumberOfActiveAnimations) |
Timing timingAutoFill; |
timingAutoFill.iterationDuration = 2; |
- RefPtr<Animation> anim1 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timingForwardFill); |
- RefPtr<Animation> anim2 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timingNoFill); |
- RefPtr<Animation> anim3 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timingBackwardFillDelay); |
- RefPtr<Animation> anim4 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timingNoFillDelay); |
- RefPtr<Animation> anim5 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timingAutoFill); |
+ RefPtr<Animation> anim1 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timingForwardFill); |
+ RefPtr<Animation> anim2 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timingNoFill); |
+ RefPtr<Animation> anim3 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timingBackwardFillDelay); |
+ RefPtr<Animation> anim4 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timingNoFillDelay); |
+ RefPtr<Animation> anim5 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timingAutoFill); |
timeline->play(anim1.get()); |
timeline->play(anim2.get()); |