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

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

Issue 1318543009: Oilpan: Partially ship Oilpan for core/animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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
« no previous file with comments | « Source/core/animation/AnimationStackTest.cpp ('k') | Source/core/animation/AnimationTimeline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationTest.cpp
diff --git a/Source/core/animation/AnimationTest.cpp b/Source/core/animation/AnimationTest.cpp
index 2ef281b89f602e7a12455ed25e2ef7e07cfaf3d7..61beaff8f4b797058a4d5a699213293442e4b793 100644
--- a/Source/core/animation/AnimationTest.cpp
+++ b/Source/core/animation/AnimationTest.cpp
@@ -58,7 +58,7 @@ protected:
timeline = AnimationTimeline::create(document.get());
animation = timeline->play(0);
animation->setStartTime(0);
- animation->setEffect(makeAnimation().get());
+ animation->setEffect(makeAnimation());
}
void startTimeline()
@@ -66,7 +66,7 @@ protected:
simulateFrame(0);
}
- PassRefPtrWillBeRawPtr<KeyframeEffect> makeAnimation(double duration = 30, double playbackRate = 1)
+ KeyframeEffect* makeAnimation(double duration = 30, double playbackRate = 1)
{
Timing timing;
timing.iterationDuration = duration;
@@ -83,8 +83,8 @@ protected:
}
RefPtrWillBePersistent<Document> document;
- RefPtrWillBePersistent<AnimationTimeline> timeline;
- RefPtrWillBePersistent<Animation> animation;
+ Persistent<AnimationTimeline> timeline;
+ Persistent<Animation> animation;
TrackExceptionState exceptionState;
};
@@ -504,7 +504,7 @@ TEST_F(AnimationAnimationTest, FinishRaisesException)
Timing timing;
timing.iterationDuration = 1;
timing.iterationCount = std::numeric_limits<double>::infinity();
- animation->setEffect(KeyframeEffect::create(0, nullptr, timing).get());
+ animation->setEffect(KeyframeEffect::create(0, nullptr, timing));
animation->setCurrentTimeInternal(10);
animation->finish(exceptionState);
@@ -621,23 +621,23 @@ TEST_F(AnimationAnimationTest, SetEffect)
{
animation = timeline->play(0);
animation->setStartTime(0);
- RefPtrWillBeRawPtr<AnimationEffect> effect1 = makeAnimation();
- RefPtrWillBeRawPtr<AnimationEffect> effect2 = makeAnimation();
- animation->setEffect(effect1.get());
+ AnimationEffect* effect1 = makeAnimation();
+ AnimationEffect* effect2 = makeAnimation();
+ animation->setEffect(effect1);
EXPECT_EQ(effect1, animation->effect());
EXPECT_EQ(0, animation->currentTimeInternal());
animation->setCurrentTimeInternal(15);
- animation->setEffect(effect2.get());
+ animation->setEffect(effect2);
EXPECT_EQ(15, animation->currentTimeInternal());
EXPECT_EQ(0, effect1->animation());
- EXPECT_EQ(animation.get(), effect2->animation());
+ EXPECT_EQ(animation, effect2->animation());
EXPECT_EQ(effect2, animation->effect());
}
TEST_F(AnimationAnimationTest, SetEffectLimitsAnimation)
{
animation->setCurrentTimeInternal(20);
- animation->setEffect(makeAnimation(10).get());
+ animation->setEffect(makeAnimation(10));
EXPECT_EQ(20, animation->currentTimeInternal());
EXPECT_TRUE(animation->limited());
simulateFrame(10);
@@ -647,7 +647,7 @@ TEST_F(AnimationAnimationTest, SetEffectLimitsAnimation)
TEST_F(AnimationAnimationTest, SetEffectUnlimitsAnimation)
{
animation->setCurrentTimeInternal(40);
- animation->setEffect(makeAnimation(60).get());
+ animation->setEffect(makeAnimation(60));
EXPECT_FALSE(animation->limited());
EXPECT_EQ(40, animation->currentTimeInternal());
simulateFrame(10);
@@ -680,8 +680,8 @@ TEST_F(AnimationAnimationTest, AnimationsReturnTimeToNextEffect)
timing.startDelay = 1;
timing.iterationDuration = 1;
timing.endDelay = 1;
- RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(0, nullptr, timing);
- animation = timeline->play(keyframeEffect.get());
+ KeyframeEffect* keyframeEffect = KeyframeEffect::create(0, nullptr, timing);
+ animation = timeline->play(keyframeEffect);
animation->setStartTime(0);
simulateFrame(0);
@@ -781,22 +781,21 @@ TEST_F(AnimationAnimationTest, AttachedAnimations)
RefPtrWillBePersistent<Element> element = document->createElement("foo", ASSERT_NO_EXCEPTION);
Timing timing;
- RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(element.get(), nullptr, timing);
- RefPtrWillBeRawPtr<Animation> animation = timeline->play(keyframeEffect.get());
+ KeyframeEffect* keyframeEffect = KeyframeEffect::create(element.get(), nullptr, timing);
+ Animation* animation = timeline->play(keyframeEffect);
simulateFrame(0);
timeline->serviceAnimations(TimingUpdateForAnimationFrame);
- EXPECT_EQ(1U, element->elementAnimations()->animations().find(animation.get())->value);
+ EXPECT_EQ(1U, element->elementAnimations()->animations().find(animation)->value);
- animation.release();
Heap::collectAllGarbage();
EXPECT_TRUE(element->elementAnimations()->animations().isEmpty());
}
TEST_F(AnimationAnimationTest, HasLowerPriority)
{
- RefPtrWillBeRawPtr<Animation> animation1 = timeline->play(0);
- RefPtrWillBeRawPtr<Animation> animation2 = timeline->play(0);
- EXPECT_TRUE(Animation::hasLowerPriority(animation1.get(), animation2.get()));
+ Animation* animation1 = timeline->play(0);
+ Animation* animation2 = timeline->play(0);
+ EXPECT_TRUE(Animation::hasLowerPriority(animation1, animation2));
}
TEST_F(AnimationAnimationTest, PlayAfterCancel)
« no previous file with comments | « Source/core/animation/AnimationStackTest.cpp ('k') | Source/core/animation/AnimationTimeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698