Source/core/animation/AnimationEffectTest.cpp - Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap.

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Resize expect size of Persistent Created 5 years, 7 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/Animation.h ('K') | « Source/core/animation/AnimationEffectReadOnly.idl ('k') | Source/core/animation/AnimationEffectTiming.h » ('j') | Source/core/animation/AnimationStack.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/AnimationEffectTest.cpp

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

index ca359672cfcddb1a9b64785bcf8390f7c00432cf..0ec74ff882323569dba88b1ec670eed2e986d3cc 100644

--- a/Source/core/animation/AnimationEffectTest.cpp

+++ b/Source/core/animation/AnimationEffectTest.cpp

@@ -62,9 +62,9 @@ private:

class TestAnimationEffect : public AnimationEffect {

public:

- static PassRefPtrWillBeRawPtr<TestAnimationEffect> create(const Timing& specified)

+ static TestAnimationEffect* create(const Timing& specified)

{

- return adoptRefWillBeNoop(new TestAnimationEffect(specified, new TestAnimationEffectEventDelegate()));

+ return new TestAnimationEffect(specified, new TestAnimationEffectEventDelegate());

}

void updateInheritedTime(double time)

@@ -109,12 +109,12 @@ public:

private:

TestAnimationEffect(const Timing& specified, TestAnimationEffectEventDelegate* eventDelegate)

- : AnimationEffect(specified, adoptPtrWillBeNoop(eventDelegate))

+ : AnimationEffect(specified, eventDelegate)

, m_eventDelegate(eventDelegate)

{

}

- RawPtrWillBeMember<TestAnimationEffectEventDelegate> m_eventDelegate;

+ Member<TestAnimationEffectEventDelegate> m_eventDelegate;

mutable double m_localTime;

mutable double m_timeToNextIteration;

};

@@ -123,7 +123,7 @@ TEST(AnimationAnimationEffectTest, Sanity)

{

Timing timing;

timing.iterationDuration = 2;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(0, animationNode->computedTiming().startTime());

@@ -176,7 +176,7 @@ TEST(AnimationAnimationEffectTest, FillAuto)

{

Timing timing;

timing.iterationDuration = 1;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->timeFraction());

@@ -190,7 +190,7 @@ TEST(AnimationAnimationEffectTest, FillForwards)

Timing timing;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_TRUE(isNull(animationNode->timeFraction()));

@@ -204,7 +204,7 @@ TEST(AnimationAnimationEffectTest, FillBackwards)

Timing timing;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeBackwards;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->timeFraction());

@@ -218,7 +218,7 @@ TEST(AnimationAnimationEffectTest, FillBoth)

Timing timing;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeBoth;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->timeFraction());

@@ -233,7 +233,7 @@ TEST(AnimationAnimationEffectTest, StartDelay)

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

timing.startDelay = 0.5;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0);

EXPECT_TRUE(isNull(animationNode->timeFraction()));

@@ -251,7 +251,7 @@ TEST(AnimationAnimationEffectTest, ZeroIteration)

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 0;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->activeDurationInternal());

@@ -270,7 +270,7 @@ TEST(AnimationAnimationEffectTest, InfiniteIteration)

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = std::numeric_limits<double>::infinity();

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_TRUE(isNull(animationNode->currentIteration()));

@@ -288,7 +288,7 @@ TEST(AnimationAnimationEffectTest, Iteration)

Timing timing;

timing.iterationCount = 2;

timing.iterationDuration = 2;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0);

EXPECT_EQ(0, animationNode->currentIteration());

@@ -318,7 +318,7 @@ TEST(AnimationAnimationEffectTest, IterationStart)

timing.iterationCount = 2.2;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeBoth;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(1, animationNode->currentIteration());

@@ -339,7 +339,7 @@ TEST(AnimationAnimationEffectTest, IterationAlternate)

timing.iterationCount = 10;

timing.iterationDuration = 1;

timing.direction = Timing::PlaybackDirectionAlternate;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0.75);

EXPECT_EQ(0, animationNode->currentIteration());

@@ -360,7 +360,7 @@ TEST(AnimationAnimationEffectTest, IterationAlternateReverse)

timing.iterationCount = 10;

timing.iterationDuration = 1;

timing.direction = Timing::PlaybackDirectionAlternateReverse;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0.75);

EXPECT_EQ(0, animationNode->currentIteration());

@@ -378,7 +378,7 @@ TEST(AnimationAnimationEffectTest, IterationAlternateReverse)

TEST(AnimationAnimationEffectTest, ZeroDurationSanity)

{

Timing timing;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(0, animationNode->computedTiming().startTime());

@@ -409,7 +409,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationFillForwards)

{

Timing timing;

timing.fillMode = Timing::FillModeForwards;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_TRUE(isNull(animationNode->timeFraction()));

@@ -425,7 +425,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationFillBackwards)

{

Timing timing;

timing.fillMode = Timing::FillModeBackwards;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->timeFraction());

@@ -441,7 +441,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationFillBoth)

{

Timing timing;

timing.fillMode = Timing::FillModeBoth;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->timeFraction());

@@ -458,7 +458,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationStartDelay)

Timing timing;

timing.fillMode = Timing::FillModeForwards;

timing.startDelay = 0.5;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0);

EXPECT_TRUE(isNull(animationNode->timeFraction()));

@@ -477,7 +477,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationStartAndCount)

timing.iterationCount = 0.2;

timing.fillMode = Timing::FillModeBoth;

timing.startDelay = 0.3;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0);

EXPECT_EQ(0.1, animationNode->timeFraction());

@@ -495,7 +495,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationInfiniteIteration)

Timing timing;

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = std::numeric_limits<double>::infinity();

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(0, animationNode->activeDurationInternal());

@@ -513,7 +513,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIteration)

Timing timing;

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_TRUE(isNull(animationNode->currentIteration()));

@@ -534,7 +534,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationStart)

timing.iterationStart = 1.2;

timing.iterationCount = 2.2;

timing.fillMode = Timing::FillModeBoth;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_EQ(1, animationNode->currentIteration());

@@ -555,7 +555,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationAlternate)

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

timing.direction = Timing::PlaybackDirectionAlternate;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_TRUE(isNull(animationNode->currentIteration()));

@@ -576,7 +576,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationAlternateReverse)

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

timing.direction = Timing::PlaybackDirectionAlternateReverse;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(-1);

EXPECT_TRUE(isNull(animationNode->currentIteration()));

@@ -596,7 +596,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationSanity)

Timing timing;

timing.iterationDuration = std::numeric_limits<double>::infinity();

timing.iterationCount = 1;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(0, animationNode->computedTiming().startTime());

@@ -627,7 +627,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationZeroIterations)

Timing timing;

timing.iterationDuration = std::numeric_limits<double>::infinity();

timing.iterationCount = 0;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(0, animationNode->computedTiming().startTime());

@@ -657,7 +657,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationInfiniteIterations)

Timing timing;

timing.iterationDuration = std::numeric_limits<double>::infinity();

timing.iterationCount = std::numeric_limits<double>::infinity();

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(0, animationNode->computedTiming().startTime());

@@ -687,7 +687,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationZeroPlaybackRate)

Timing timing;

timing.iterationDuration = std::numeric_limits<double>::infinity();

timing.playbackRate = 0;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(0, animationNode->computedTiming().startTime());

@@ -719,7 +719,7 @@ TEST(AnimationAnimationEffectTest, EndTime)

timing.endDelay = 2;

timing.iterationDuration = 4;

timing.iterationCount = 2;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

EXPECT_EQ(11, animationNode->endTimeInternal());

}

@@ -730,7 +730,7 @@ TEST(AnimationAnimationEffectTest, Events)

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

timing.startDelay = 1;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0.0, TimingUpdateOnDemand);

EXPECT_FALSE(animationNode->eventDelegate()->eventTriggered());

@@ -755,7 +755,7 @@ TEST(AnimationAnimationEffectTest, TimeToEffectChange)

timing.iterationCount = 2.5;

timing.startDelay = 1;

timing.direction = Timing::PlaybackDirectionAlternate;

- RefPtrWillBeRawPtr<TestAnimationEffect> animationNode = TestAnimationEffect::create(timing);

+ TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);

animationNode->updateInheritedTime(0);

EXPECT_EQ(0, animationNode->takeLocalTime());