Source/core/animation/DocumentTimelineTest.cpp - Issue 215883005: Web Animations: Introduce String based KeyframeEffectModel

Unified Diff: Source/core/animation/DocumentTimelineTest.cpp

Issue 215883005: Web Animations: Introduce String based KeyframeEffectModel (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/core/animation/AnimatableValueKeyframe.h ('K') | « Source/core/animation/CompositorAnimationsTest.cpp ('k') | Source/core/animation/EffectInput.cpp » ('j') | Source/core/animation/Keyframe.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/DocumentTimelineTest.cpp

diff --git a/Source/core/animation/DocumentTimelineTest.cpp b/Source/core/animation/DocumentTimelineTest.cpp

index 8be0696c8a4a9a4effeab5ccc3dd2b62477a5a05..12946feb25914a1f356d076296c79eae28773a20 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<KeyframeEffectModel> effect = KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector());

+ RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());

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<KeyframeEffectModel> effect = KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector());

+ RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());

timing.fillMode = Timing::FillModeForwards;

RefPtr<Animation> anim = Animation::create(element.get(), effect, timing);

@@ -188,8 +188,8 @@ TEST_F(AnimationDocumentTimelineTest, PauseForTesting)

{

float seekTime = 1;

timing.fillMode = Timing::FillModeForwards;

- RefPtr<Animation> anim1 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timing);

- RefPtr<Animation> anim2 = Animation::create(element.get(), KeyframeEffectModel::create(KeyframeEffectModel::KeyframeVector()), timing);

+ RefPtr<Animation> anim1 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing);

+ RefPtr<Animation> anim2 = Animation::create(element.get(), AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector()), timing);

AnimationPlayer* player1 = timeline->play(anim1.get());

AnimationPlayer* player2 = timeline->play(anim2.get());

timeline->pauseAnimationsForTesting(seekTime);

@@ -221,11 +221,11 @@ TEST_F(AnimationDocumentTimelineTest, NumberOfActiveAnimations)

Timing timingAutoFill;

timingAutoFill.iterationDuration = 2;

- 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);

+ 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);

timeline->play(anim1.get());

timeline->play(anim2.get());