Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: Source/core/animation/AnimationPlayerTest.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
Index: Source/core/animation/AnimationPlayerTest.cpp
diff --git a/Source/core/animation/AnimationPlayerTest.cpp b/Source/core/animation/AnimationPlayerTest.cpp
index c943bef38b0cc99e02cf6ce57e1df186981702ee..920f8d642b10b08b7410f6641c1290179acd6550 100644
--- a/Source/core/animation/AnimationPlayerTest.cpp
+++ b/Source/core/animation/AnimationPlayerTest.cpp
@@ -60,7 +60,7 @@ protected:
timeline = AnimationTimeline::create(document.get());
player = timeline->play(0);
player->setStartTime(0);
- player->setSource(makeAnimation().get());
+ player->setSource(makeAnimation());
}
void startTimeline()
@@ -68,7 +68,7 @@ protected:
simulateFrame(0);
}
- PassRefPtrWillBeRawPtr<Animation> makeAnimation(double duration = 30, double playbackRate = 1)
+ Animation* makeAnimation(double duration = 30, double playbackRate = 1)
{
Timing timing;
timing.iterationDuration = duration;
@@ -85,7 +85,7 @@ protected:
}
RefPtrWillBePersistent<Document> document;
- RefPtrWillBePersistent<AnimationTimeline> timeline;
+ Persistent<AnimationTimeline> timeline;
RefPtrWillBePersistent<AnimationPlayer> player;
TrackExceptionState exceptionState;
};
@@ -508,7 +508,7 @@ TEST_F(AnimationAnimationPlayerTest, FinishRaisesException)
Timing timing;
timing.iterationDuration = 1;
timing.iterationCount = std::numeric_limits<double>::infinity();
- player->setSource(Animation::create(0, nullptr, timing).get());
+ player->setSource(Animation::create(0, nullptr, timing));
player->setCurrentTimeInternal(10);
player->finish(exceptionState);
@@ -626,13 +626,13 @@ TEST_F(AnimationAnimationPlayerTest, SetSource)
{
player = timeline->play(0);
player->setStartTime(0);
- RefPtrWillBeRawPtr<AnimationNode> source1 = makeAnimation();
- RefPtrWillBeRawPtr<AnimationNode> source2 = makeAnimation();
- player->setSource(source1.get());
+ AnimationNode* source1 = makeAnimation();
+ AnimationNode* source2 = makeAnimation();
+ player->setSource(source1);
EXPECT_EQ(source1, player->source());
EXPECT_EQ(0, player->currentTimeInternal());
player->setCurrentTimeInternal(15);
- player->setSource(source2.get());
+ player->setSource(source2);
EXPECT_EQ(15, player->currentTimeInternal());
EXPECT_EQ(0, source1->player());
EXPECT_EQ(player.get(), source2->player());
@@ -642,7 +642,7 @@ TEST_F(AnimationAnimationPlayerTest, SetSource)
TEST_F(AnimationAnimationPlayerTest, SetSourceLimitsAnimationPlayer)
{
player->setCurrentTimeInternal(20);
- player->setSource(makeAnimation(10).get());
+ player->setSource(makeAnimation(10));
EXPECT_EQ(20, player->currentTimeInternal());
EXPECT_TRUE(player->limited());
simulateFrame(10);
@@ -652,7 +652,7 @@ TEST_F(AnimationAnimationPlayerTest, SetSourceLimitsAnimationPlayer)
TEST_F(AnimationAnimationPlayerTest, SetSourceUnlimitsAnimationPlayer)
{
player->setCurrentTimeInternal(40);
- player->setSource(makeAnimation(60).get());
+ player->setSource(makeAnimation(60));
EXPECT_FALSE(player->limited());
EXPECT_EQ(40, player->currentTimeInternal());
simulateFrame(10);
@@ -685,8 +685,8 @@ TEST_F(AnimationAnimationPlayerTest, AnimationPlayersReturnTimeToNextEffect)
timing.startDelay = 1;
timing.iterationDuration = 1;
timing.endDelay = 1;
- RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);
- player = timeline->play(animation.get());
+ Animation* animation = Animation::create(0, nullptr, timing);
+ player = timeline->play(animation);
player->setStartTime(0);
simulateFrame(0);
@@ -786,8 +786,8 @@ TEST_F(AnimationAnimationPlayerTest, AttachedAnimationPlayers)
RefPtrWillBePersistent<Element> element = document->createElement("foo", ASSERT_NO_EXCEPTION);
Timing timing;
- RefPtrWillBeRawPtr<Animation> animation = Animation::create(element.get(), nullptr, timing);
- RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->play(animation.get());
+ Animation* animation = Animation::create(element.get(), nullptr, timing);
+ RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->play(animation);
simulateFrame(0);
timeline->serviceAnimations(TimingUpdateForAnimationFrame);
EXPECT_EQ(1U, element->elementAnimations()->players().find(player.get())->value);

Powered by Google App Engine
This is Rietveld 408576698