| Index: Source/core/animation/TimedItemTest.cpp
|
| diff --git a/Source/core/animation/TimedItemTest.cpp b/Source/core/animation/TimedItemTest.cpp
|
| index 9bcc62183b8cd47beeb4241eba7264a8ff44839a..a6773f5b1216df8290cdfa6e40fa908bb26fedfa 100644
|
| --- a/Source/core/animation/TimedItemTest.cpp
|
| +++ b/Source/core/animation/TimedItemTest.cpp
|
| @@ -56,9 +56,9 @@ private:
|
|
|
| class TestTimedItem : public TimedItem {
|
| public:
|
| - static PassRefPtr<TestTimedItem> create(const Timing& specified)
|
| + static PassRefPtrWillBeRawPtr<TestTimedItem> create(const Timing& specified)
|
| {
|
| - return adoptRef(new TestTimedItem(specified, new TestTimedItemEventDelegate()));
|
| + return adoptRefWillBeNoop(new TestTimedItem(specified, new TestTimedItemEventDelegate()));
|
| }
|
|
|
| void updateInheritedTime(double time)
|
| @@ -111,7 +111,7 @@ TEST(AnimationTimedItemTest, Sanity)
|
| {
|
| Timing timing;
|
| timing.iterationDuration = 2;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| EXPECT_EQ(0, timedItem->startTime());
|
|
|
| @@ -164,7 +164,7 @@ TEST(AnimationTimedItemTest, FillAuto)
|
| {
|
| Timing timing;
|
| timing.iterationDuration = 1;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->timeFraction());
|
| @@ -178,7 +178,7 @@ TEST(AnimationTimedItemTest, FillForwards)
|
| Timing timing;
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeForwards;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_TRUE(isNull(timedItem->timeFraction()));
|
| @@ -192,7 +192,7 @@ TEST(AnimationTimedItemTest, FillBackwards)
|
| Timing timing;
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeBackwards;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->timeFraction());
|
| @@ -206,7 +206,7 @@ TEST(AnimationTimedItemTest, FillBoth)
|
| Timing timing;
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeBoth;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->timeFraction());
|
| @@ -221,7 +221,7 @@ TEST(AnimationTimedItemTest, StartDelay)
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.startDelay = 0.5;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0);
|
| EXPECT_TRUE(isNull(timedItem->timeFraction()));
|
| @@ -239,7 +239,7 @@ TEST(AnimationTimedItemTest, ZeroIteration)
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = 0;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->activeDurationInternal());
|
| @@ -258,7 +258,7 @@ TEST(AnimationTimedItemTest, InfiniteIteration)
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = std::numeric_limits<double>::infinity();
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_TRUE(isNull(timedItem->currentIteration()));
|
| @@ -276,7 +276,7 @@ TEST(AnimationTimedItemTest, Iteration)
|
| Timing timing;
|
| timing.iterationCount = 2;
|
| timing.iterationDuration = 2;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0);
|
| EXPECT_EQ(0, timedItem->currentIteration());
|
| @@ -306,7 +306,7 @@ TEST(AnimationTimedItemTest, IterationStart)
|
| timing.iterationCount = 2.2;
|
| timing.iterationDuration = 1;
|
| timing.fillMode = Timing::FillModeBoth;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(1, timedItem->currentIteration());
|
| @@ -327,7 +327,7 @@ TEST(AnimationTimedItemTest, IterationAlternate)
|
| timing.iterationCount = 10;
|
| timing.iterationDuration = 1;
|
| timing.direction = Timing::PlaybackDirectionAlternate;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0.75);
|
| EXPECT_EQ(0, timedItem->currentIteration());
|
| @@ -348,7 +348,7 @@ TEST(AnimationTimedItemTest, IterationAlternateReverse)
|
| timing.iterationCount = 10;
|
| timing.iterationDuration = 1;
|
| timing.direction = Timing::PlaybackDirectionAlternateReverse;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0.75);
|
| EXPECT_EQ(0, timedItem->currentIteration());
|
| @@ -366,7 +366,7 @@ TEST(AnimationTimedItemTest, IterationAlternateReverse)
|
| TEST(AnimationTimedItemTest, ZeroDurationSanity)
|
| {
|
| Timing timing;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| EXPECT_EQ(0, timedItem->startTime());
|
|
|
| @@ -397,7 +397,7 @@ TEST(AnimationTimedItemTest, ZeroDurationFillForwards)
|
| {
|
| Timing timing;
|
| timing.fillMode = Timing::FillModeForwards;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_TRUE(isNull(timedItem->timeFraction()));
|
| @@ -413,7 +413,7 @@ TEST(AnimationTimedItemTest, ZeroDurationFillBackwards)
|
| {
|
| Timing timing;
|
| timing.fillMode = Timing::FillModeBackwards;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->timeFraction());
|
| @@ -429,7 +429,7 @@ TEST(AnimationTimedItemTest, ZeroDurationFillBoth)
|
| {
|
| Timing timing;
|
| timing.fillMode = Timing::FillModeBoth;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->timeFraction());
|
| @@ -446,7 +446,7 @@ TEST(AnimationTimedItemTest, ZeroDurationStartDelay)
|
| Timing timing;
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.startDelay = 0.5;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0);
|
| EXPECT_TRUE(isNull(timedItem->timeFraction()));
|
| @@ -465,7 +465,7 @@ TEST(AnimationTimedItemTest, ZeroDurationIterationStartAndCount)
|
| timing.iterationCount = 0.2;
|
| timing.fillMode = Timing::FillModeBoth;
|
| timing.startDelay = 0.3;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0);
|
| EXPECT_EQ(0.1, timedItem->timeFraction());
|
| @@ -483,7 +483,7 @@ TEST(AnimationTimedItemTest, ZeroDurationInfiniteIteration)
|
| Timing timing;
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = std::numeric_limits<double>::infinity();
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(0, timedItem->activeDurationInternal());
|
| @@ -501,7 +501,7 @@ TEST(AnimationTimedItemTest, ZeroDurationIteration)
|
| Timing timing;
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = 2;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_TRUE(isNull(timedItem->currentIteration()));
|
| @@ -522,7 +522,7 @@ TEST(AnimationTimedItemTest, ZeroDurationIterationStart)
|
| timing.iterationStart = 1.2;
|
| timing.iterationCount = 2.2;
|
| timing.fillMode = Timing::FillModeBoth;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_EQ(1, timedItem->currentIteration());
|
| @@ -543,7 +543,7 @@ TEST(AnimationTimedItemTest, ZeroDurationIterationAlternate)
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = 2;
|
| timing.direction = Timing::PlaybackDirectionAlternate;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_TRUE(isNull(timedItem->currentIteration()));
|
| @@ -564,7 +564,7 @@ TEST(AnimationTimedItemTest, ZeroDurationIterationAlternateReverse)
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = 2;
|
| timing.direction = Timing::PlaybackDirectionAlternateReverse;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(-1);
|
| EXPECT_TRUE(isNull(timedItem->currentIteration()));
|
| @@ -584,7 +584,7 @@ TEST(AnimationTimedItemTest, InfiniteDurationSanity)
|
| Timing timing;
|
| timing.iterationDuration = std::numeric_limits<double>::infinity();
|
| timing.iterationCount = 1;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| EXPECT_EQ(0, timedItem->startTime());
|
|
|
| @@ -615,7 +615,7 @@ TEST(AnimationTimedItemTest, InfiniteDurationZeroIterations)
|
| Timing timing;
|
| timing.iterationDuration = std::numeric_limits<double>::infinity();
|
| timing.iterationCount = 0;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| EXPECT_EQ(0, timedItem->startTime());
|
|
|
| @@ -645,7 +645,7 @@ TEST(AnimationTimedItemTest, InfiniteDurationInfiniteIterations)
|
| Timing timing;
|
| timing.iterationDuration = std::numeric_limits<double>::infinity();
|
| timing.iterationCount = std::numeric_limits<double>::infinity();
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| EXPECT_EQ(0, timedItem->startTime());
|
|
|
| @@ -675,7 +675,7 @@ TEST(AnimationTimedItemTest, InfiniteDurationZeroPlaybackRate)
|
| Timing timing;
|
| timing.iterationDuration = std::numeric_limits<double>::infinity();
|
| timing.playbackRate = 0;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| EXPECT_EQ(0, timedItem->startTime());
|
|
|
| @@ -707,7 +707,7 @@ TEST(AnimationTimedItemTest, EndTime)
|
| timing.endDelay = 2;
|
| timing.iterationDuration = 4;
|
| timing.iterationCount = 2;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| EXPECT_EQ(11, timedItem->endTimeInternal());
|
| }
|
|
|
| @@ -718,7 +718,7 @@ TEST(AnimationTimedItemTest, Events)
|
| timing.fillMode = Timing::FillModeForwards;
|
| timing.iterationCount = 2;
|
| timing.startDelay = 1;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0.0, TimingUpdateOnDemand);
|
| EXPECT_FALSE(timedItem->eventDelegate()->eventTriggered());
|
| @@ -743,7 +743,7 @@ TEST(AnimationTimedItemTest, TimeToEffectChange)
|
| timing.iterationCount = 2.5;
|
| timing.startDelay = 1;
|
| timing.direction = Timing::PlaybackDirectionAlternate;
|
| - RefPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
| + RefPtrWillBeRawPtr<TestTimedItem> timedItem = TestTimedItem::create(timing);
|
|
|
| timedItem->updateInheritedTime(0);
|
| EXPECT_EQ(0, timedItem->takeLocalTime());
|
|
|