| Index: Source/core/animation/DocumentTimelineTest.cpp
|
| diff --git a/Source/core/animation/DocumentTimelineTest.cpp b/Source/core/animation/DocumentTimelineTest.cpp
|
| index eb66e861c9b08f9ea565f8ff2efd4d8309f757ff..99332dce59dc13fb53e7f1699ffd57b0cf785ba7 100644
|
| --- a/Source/core/animation/DocumentTimelineTest.cpp
|
| +++ b/Source/core/animation/DocumentTimelineTest.cpp
|
| @@ -79,7 +79,7 @@ public:
|
| }
|
| };
|
|
|
| -class CoreAnimationDocumentTimelineTest : public ::testing::Test {
|
| +class AnimationDocumentTimelineTest : public ::testing::Test {
|
| protected:
|
| virtual void SetUp()
|
| {
|
| @@ -122,7 +122,7 @@ protected:
|
| }
|
| };
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, HasStarted)
|
| +TEST_F(AnimationDocumentTimelineTest, HasStarted)
|
| {
|
| timeline = DocumentTimeline::create(document.get());
|
| EXPECT_FALSE(timeline->hasStarted());
|
| @@ -130,7 +130,7 @@ TEST_F(CoreAnimationDocumentTimelineTest, HasStarted)
|
| EXPECT_TRUE(timeline->hasStarted());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, EmptyKeyframeAnimation)
|
| +TEST_F(AnimationDocumentTimelineTest, EmptyKeyframeAnimation)
|
| {
|
| RefPtr<KeyframeAnimationEffect> effect = KeyframeAnimationEffect::create(KeyframeAnimationEffect::KeyframeVector());
|
| RefPtr<Animation> anim = Animation::create(element.get(), effect, timing);
|
| @@ -147,20 +147,20 @@ TEST_F(CoreAnimationDocumentTimelineTest, EmptyKeyframeAnimation)
|
| EXPECT_FLOAT_EQ(100, timeline->currentTime());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, EmptyTimelineDoesNotTriggerStyleRecalc)
|
| +TEST_F(AnimationDocumentTimelineTest, EmptyTimelineDoesNotTriggerStyleRecalc)
|
| {
|
| document->animationClock().updateTime(100);
|
| EXPECT_FALSE(timeline->serviceAnimations());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, EmptyPlayerDoesNotTriggerStyleRecalc)
|
| +TEST_F(AnimationDocumentTimelineTest, EmptyPlayerDoesNotTriggerStyleRecalc)
|
| {
|
| timeline->play(0);
|
| document->animationClock().updateTime(100);
|
| EXPECT_FALSE(timeline->serviceAnimations());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, EmptyTargetDoesNotTriggerStyleRecalc)
|
| +TEST_F(AnimationDocumentTimelineTest, EmptyTargetDoesNotTriggerStyleRecalc)
|
| {
|
| timing.iterationDuration = 200;
|
| timeline->play(Animation::create(0, KeyframeAnimationEffect::create(KeyframeAnimationEffect::KeyframeVector()), timing).get());
|
| @@ -168,21 +168,21 @@ TEST_F(CoreAnimationDocumentTimelineTest, EmptyTargetDoesNotTriggerStyleRecalc)
|
| EXPECT_FALSE(timeline->serviceAnimations());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, EmptyEffectDoesNotTriggerStyleRecalc)
|
| +TEST_F(AnimationDocumentTimelineTest, EmptyEffectDoesNotTriggerStyleRecalc)
|
| {
|
| timeline->play(Animation::create(element.get(), 0, timing).get());
|
| document->animationClock().updateTime(100);
|
| EXPECT_FALSE(timeline->serviceAnimations());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, TriggerStyleRecalc)
|
| +TEST_F(AnimationDocumentTimelineTest, TriggerStyleRecalc)
|
| {
|
| timeline->play(Animation::create(element.get(), KeyframeAnimationEffect::create(KeyframeAnimationEffect::KeyframeVector()), timing).get());
|
| document->animationClock().updateTime(100);
|
| EXPECT_TRUE(timeline->serviceAnimations());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, ZeroTime)
|
| +TEST_F(AnimationDocumentTimelineTest, ZeroTime)
|
| {
|
| timeline = DocumentTimeline::create(document.get());
|
|
|
| @@ -200,7 +200,7 @@ TEST_F(CoreAnimationDocumentTimelineTest, ZeroTime)
|
| EXPECT_EQ(100, timeline->currentTime());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, PauseForTesting)
|
| +TEST_F(AnimationDocumentTimelineTest, PauseForTesting)
|
| {
|
| float seekTime = 1;
|
| RefPtr<Animation> anim1 = Animation::create(element.get(), KeyframeAnimationEffect::create(KeyframeAnimationEffect::KeyframeVector()), timing);
|
| @@ -213,7 +213,7 @@ TEST_F(CoreAnimationDocumentTimelineTest, PauseForTesting)
|
| EXPECT_FLOAT_EQ(seekTime, player2->currentTime());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, NumberOfActiveAnimations)
|
| +TEST_F(AnimationDocumentTimelineTest, NumberOfActiveAnimations)
|
| {
|
| Timing timingForwardFill;
|
| timingForwardFill.hasIterationDuration = true;
|
| @@ -260,7 +260,7 @@ TEST_F(CoreAnimationDocumentTimelineTest, NumberOfActiveAnimations)
|
| EXPECT_EQ(1U, timeline->numberOfActiveAnimationsForTesting());
|
| }
|
|
|
| -TEST_F(CoreAnimationDocumentTimelineTest, DelayBeforeAnimationStart)
|
| +TEST_F(AnimationDocumentTimelineTest, DelayBeforeAnimationStart)
|
| {
|
| timing.hasIterationDuration = true;
|
| timing.iterationDuration = 2;
|
|
|