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

Unified Diff: Source/core/animation/AnimationNodeTest.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: Build fix Created 5 years, 8 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.cpp ('K') | « Source/core/animation/AnimationNode.idl ('k') | Source/core/animation/AnimationNodeTiming.h » ('j') | Source/core/animation/AnimationTimeline.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/AnimationNodeTest.cpp

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

index d883b80004aca02d98b2a457838818d9e3555201..0fe8368916562c276b43ee70864ca8a9988c14d6 100644

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

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

@@ -61,9 +61,9 @@ private:

class TestAnimationNode : public AnimationNode {

public:

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

+ static TestAnimationNode* create(const Timing& specified)

{

- return adoptRefWillBeNoop(new TestAnimationNode(specified, new TestAnimationNodeEventDelegate()));

+ return new TestAnimationNode(specified, new TestAnimationNodeEventDelegate());

}

void updateInheritedTime(double time)

@@ -108,12 +108,12 @@ public:

private:

TestAnimationNode(const Timing& specified, TestAnimationNodeEventDelegate* eventDelegate)

- : AnimationNode(specified, adoptPtrWillBeNoop(eventDelegate))

+ : AnimationNode(specified, eventDelegate)

, m_eventDelegate(eventDelegate)

{

}

- RawPtrWillBeMember<TestAnimationNodeEventDelegate> m_eventDelegate;

+ Member<TestAnimationNodeEventDelegate> m_eventDelegate;

mutable double m_localTime;

mutable double m_timeToNextIteration;

};

@@ -122,7 +122,7 @@ TEST(AnimationAnimationNodeTest, Sanity)

{

Timing timing;

timing.iterationDuration = 2;

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

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

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

@@ -175,7 +175,7 @@ TEST(AnimationAnimationNodeTest, FillAuto)

{

Timing timing;

timing.iterationDuration = 1;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -189,7 +189,7 @@ TEST(AnimationAnimationNodeTest, FillForwards)

Timing timing;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -203,7 +203,7 @@ TEST(AnimationAnimationNodeTest, FillBackwards)

Timing timing;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeBackwards;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -217,7 +217,7 @@ TEST(AnimationAnimationNodeTest, FillBoth)

Timing timing;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeBoth;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -232,7 +232,7 @@ TEST(AnimationAnimationNodeTest, StartDelay)

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

timing.startDelay = 0.5;

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

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

animationNode->updateInheritedTime(0);

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

@@ -250,7 +250,7 @@ TEST(AnimationAnimationNodeTest, ZeroIteration)

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 0;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -269,7 +269,7 @@ TEST(AnimationAnimationNodeTest, InfiniteIteration)

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeForwards;

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

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

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

animationNode->updateInheritedTime(-1);

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

@@ -287,7 +287,7 @@ TEST(AnimationAnimationNodeTest, Iteration)

Timing timing;

timing.iterationCount = 2;

timing.iterationDuration = 2;

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

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

animationNode->updateInheritedTime(0);

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

@@ -317,7 +317,7 @@ TEST(AnimationAnimationNodeTest, IterationStart)

timing.iterationCount = 2.2;

timing.iterationDuration = 1;

timing.fillMode = Timing::FillModeBoth;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -338,7 +338,7 @@ TEST(AnimationAnimationNodeTest, IterationAlternate)

timing.iterationCount = 10;

timing.iterationDuration = 1;

timing.direction = Timing::PlaybackDirectionAlternate;

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

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

animationNode->updateInheritedTime(0.75);

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

@@ -359,7 +359,7 @@ TEST(AnimationAnimationNodeTest, IterationAlternateReverse)

timing.iterationCount = 10;

timing.iterationDuration = 1;

timing.direction = Timing::PlaybackDirectionAlternateReverse;

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

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

animationNode->updateInheritedTime(0.75);

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

@@ -377,7 +377,7 @@ TEST(AnimationAnimationNodeTest, IterationAlternateReverse)

TEST(AnimationAnimationNodeTest, ZeroDurationSanity)

{

Timing timing;

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

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

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

@@ -408,7 +408,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationFillForwards)

{

Timing timing;

timing.fillMode = Timing::FillModeForwards;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -424,7 +424,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationFillBackwards)

{

Timing timing;

timing.fillMode = Timing::FillModeBackwards;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -440,7 +440,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationFillBoth)

{

Timing timing;

timing.fillMode = Timing::FillModeBoth;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -457,7 +457,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationStartDelay)

Timing timing;

timing.fillMode = Timing::FillModeForwards;

timing.startDelay = 0.5;

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

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

animationNode->updateInheritedTime(0);

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

@@ -476,7 +476,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationIterationStartAndCount)

timing.iterationCount = 0.2;

timing.fillMode = Timing::FillModeBoth;

timing.startDelay = 0.3;

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

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

animationNode->updateInheritedTime(0);

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

@@ -494,7 +494,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationInfiniteIteration)

Timing timing;

timing.fillMode = Timing::FillModeForwards;

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

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

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

animationNode->updateInheritedTime(-1);

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

@@ -512,7 +512,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationIteration)

Timing timing;

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -533,7 +533,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationIterationStart)

timing.iterationStart = 1.2;

timing.iterationCount = 2.2;

timing.fillMode = Timing::FillModeBoth;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -554,7 +554,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationIterationAlternate)

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

timing.direction = Timing::PlaybackDirectionAlternate;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -575,7 +575,7 @@ TEST(AnimationAnimationNodeTest, ZeroDurationIterationAlternateReverse)

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

timing.direction = Timing::PlaybackDirectionAlternateReverse;

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

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

animationNode->updateInheritedTime(-1);

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

@@ -595,7 +595,7 @@ TEST(AnimationAnimationNodeTest, InfiniteDurationSanity)

Timing timing;

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

timing.iterationCount = 1;

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

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

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

@@ -626,7 +626,7 @@ TEST(AnimationAnimationNodeTest, InfiniteDurationZeroIterations)

Timing timing;

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

timing.iterationCount = 0;

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

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

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

@@ -656,7 +656,7 @@ TEST(AnimationAnimationNodeTest, InfiniteDurationInfiniteIterations)

Timing timing;

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

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

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

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

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

@@ -686,7 +686,7 @@ TEST(AnimationAnimationNodeTest, InfiniteDurationZeroPlaybackRate)

Timing timing;

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

timing.playbackRate = 0;

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

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

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

@@ -718,7 +718,7 @@ TEST(AnimationAnimationNodeTest, EndTime)

timing.endDelay = 2;

timing.iterationDuration = 4;

timing.iterationCount = 2;

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

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

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

}

@@ -729,7 +729,7 @@ TEST(AnimationAnimationNodeTest, Events)

timing.fillMode = Timing::FillModeForwards;

timing.iterationCount = 2;

timing.startDelay = 1;

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

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

animationNode->updateInheritedTime(0.0, TimingUpdateOnDemand);

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

@@ -754,7 +754,7 @@ TEST(AnimationAnimationNodeTest, TimeToEffectChange)

timing.iterationCount = 2.5;

timing.startDelay = 1;

timing.direction = Timing::PlaybackDirectionAlternate;

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

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

animationNode->updateInheritedTime(0);

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