| Index: Source/core/animation/TimedItemTest.cpp
|
| diff --git a/Source/core/animation/TimedItemTest.cpp b/Source/core/animation/TimedItemTest.cpp
|
| index 76dcc8f7a45aeb99c5502a9e9d6d0cb89c6fddcf..1043bbc2cd8765ed807d1937537de66bfd679394 100644
|
| --- a/Source/core/animation/TimedItemTest.cpp
|
| +++ b/Source/core/animation/TimedItemTest.cpp
|
| @@ -64,9 +64,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)
|
| @@ -114,7 +114,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());
|
|
|
| @@ -167,7 +167,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());
|
| @@ -181,7 +181,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()));
|
| @@ -195,7 +195,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());
|
| @@ -209,7 +209,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());
|
| @@ -224,7 +224,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()));
|
| @@ -242,7 +242,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->activeDuration());
|
| @@ -261,7 +261,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()));
|
| @@ -279,7 +279,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());
|
| @@ -309,7 +309,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());
|
| @@ -330,7 +330,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());
|
| @@ -351,7 +351,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());
|
| @@ -369,7 +369,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());
|
|
|
| @@ -400,7 +400,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()));
|
| @@ -416,7 +416,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());
|
| @@ -432,7 +432,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());
|
| @@ -449,7 +449,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()));
|
| @@ -468,7 +468,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());
|
| @@ -486,7 +486,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->activeDuration());
|
| @@ -504,7 +504,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()));
|
| @@ -525,7 +525,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());
|
| @@ -546,7 +546,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()));
|
| @@ -567,7 +567,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()));
|
| @@ -587,7 +587,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());
|
|
|
| @@ -618,7 +618,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());
|
|
|
| @@ -648,7 +648,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());
|
|
|
| @@ -678,7 +678,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());
|
|
|
| @@ -710,7 +710,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->endTime());
|
| }
|
|
|
| @@ -721,7 +721,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);
|
|
|
| // First sample
|
| timedItem->updateInheritedTime(0.0);
|
| @@ -768,7 +768,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());
|
|
|