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

Unified Diff: Source/core/animation/AnimationTest.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/AnimationStackTest.cpp ('k') | Source/core/animation/AnimationTimeline.h » ('j') | Source/core/animation/AnimationTimeline.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/AnimationTest.cpp

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

index d271e83b23bfc35c5f338f913aa73050d3d7fcd7..2c0106bce01ff0bdadcd54ef431cc380291a96f4 100644

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

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

@@ -49,11 +49,11 @@ protected:

}

template<typename T>

- static PassRefPtrWillBeRawPtr<Animation> createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, T timingInput, ExceptionState& exceptionState)

+ static Animation* createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, T timingInput, ExceptionState& exceptionState)

{

return Animation::create(element, keyframeDictionaryVector, timingInput, exceptionState);

}

- static PassRefPtrWillBeRawPtr<Animation> createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, ExceptionState& exceptionState)

+ static Animation* createAnimation(Element* element, Vector<Dictionary> keyframeDictionaryVector, ExceptionState& exceptionState)

{

return Animation::create(element, keyframeDictionaryVector, exceptionState);

}

@@ -88,7 +88,7 @@ TEST_F(AnimationAnimationV8Test, CanCreateAnAnimation)

ASSERT_TRUE(DictionaryHelper::get(jsKeyframes[1], "width", value2));

ASSERT_EQ("0px", value2);

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, 0, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, 0, exceptionState);

Element* target = animation->target();

EXPECT_EQ(*element.get(), *target);

@@ -115,7 +115,7 @@ TEST_F(AnimationAnimationV8Test, CanSetDuration)

Vector<Dictionary, 0> jsKeyframes;

double duration = 2000;

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, duration, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, duration, exceptionState);

EXPECT_EQ(duration / 1000, animation->specifiedTiming().iterationDuration);

}

@@ -123,14 +123,14 @@ TEST_F(AnimationAnimationV8Test, CanSetDuration)

TEST_F(AnimationAnimationV8Test, CanOmitSpecifiedDuration)

{

Vector<Dictionary, 0> jsKeyframes;

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, exceptionState);

EXPECT_TRUE(std::isnan(animation->specifiedTiming().iterationDuration));

}

TEST_F(AnimationAnimationV8Test, NegativeDurationIsAuto)

{

Vector<Dictionary, 0> jsKeyframes;

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, -2, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, -2, exceptionState);

EXPECT_TRUE(std::isnan(animation->specifiedTiming().iterationDuration));

}

@@ -233,9 +233,9 @@ TEST_F(AnimationAnimationV8Test, SpecifiedGetters)

AnimationTimingProperties timingInputDictionary;

V8AnimationTimingProperties::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState);

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);

- RefPtrWillBeRawPtr<AnimationNodeTiming> specified = animation->timing();

+ AnimationNodeTiming* specified = animation->timing();

EXPECT_EQ(2, specified->delay());

EXPECT_EQ(0.5, specified->endDelay());

EXPECT_EQ("backwards", specified->fill());

@@ -255,9 +255,9 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)

AnimationTimingProperties timingInputDictionaryWithDuration;

V8AnimationTimingProperties::toImpl(m_isolate, timingInputWithDuration, timingInputDictionaryWithDuration, exceptionState);

- RefPtrWillBeRawPtr<Animation> animationWithDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryWithDuration, exceptionState);

+ Animation* animationWithDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryWithDuration, exceptionState);

- RefPtrWillBeRawPtr<AnimationNodeTiming> specifiedWithDuration = animationWithDuration->timing();

+ AnimationNodeTiming* specifiedWithDuration = animationWithDuration->timing();

UnrestrictedDoubleOrString duration;

specifiedWithDuration->duration(duration);

EXPECT_TRUE(duration.isUnrestrictedDouble());

@@ -269,9 +269,9 @@ TEST_F(AnimationAnimationV8Test, SpecifiedDurationGetter)

AnimationTimingProperties timingInputDictionaryNoDuration;

V8AnimationTimingProperties::toImpl(m_isolate, timingInputNoDuration, timingInputDictionaryNoDuration, exceptionState);

- RefPtrWillBeRawPtr<Animation> animationNoDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryNoDuration, exceptionState);

+ Animation* animationNoDuration = createAnimation(element.get(), jsKeyframes, timingInputDictionaryNoDuration, exceptionState);

- RefPtrWillBeRawPtr<AnimationNodeTiming> specifiedNoDuration = animationNoDuration->timing();

+ AnimationNodeTiming* specifiedNoDuration = animationNoDuration->timing();

UnrestrictedDoubleOrString duration2;

specifiedNoDuration->duration(duration2);

EXPECT_FALSE(duration2.isUnrestrictedDouble());

@@ -285,9 +285,9 @@ TEST_F(AnimationAnimationV8Test, SpecifiedSetters)

v8::Local<v8::Object> timingInput = v8::Object::New(m_isolate);

AnimationTimingProperties timingInputDictionary;

V8AnimationTimingProperties::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState);

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);

- RefPtrWillBeRawPtr<AnimationNodeTiming> specified = animation->timing();

+ AnimationNodeTiming* specified = animation->timing();

EXPECT_EQ(0, specified->delay());

specified->setDelay(2);

@@ -328,9 +328,9 @@ TEST_F(AnimationAnimationV8Test, SetSpecifiedDuration)

v8::Local<v8::Object> timingInput = v8::Object::New(m_isolate);

AnimationTimingProperties timingInputDictionary;

V8AnimationTimingProperties::toImpl(m_isolate, timingInput, timingInputDictionary, exceptionState);

- RefPtrWillBeRawPtr<Animation> animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);

+ Animation* animation = createAnimation(element.get(), jsKeyframes, timingInputDictionary, exceptionState);

- RefPtrWillBeRawPtr<AnimationNodeTiming> specified = animation->timing();

+ AnimationNodeTiming* specified = animation->timing();

UnrestrictedDoubleOrString duration;

specified->duration(duration);

@@ -355,8 +355,8 @@ TEST_F(AnimationAnimationTest, TimeToEffectChange)

timing.startDelay = 100;

timing.endDelay = 100;

timing.fillMode = Timing::FillModeNone;

- RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);

- RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation.get());

+ Animation* animation = Animation::create(0, nullptr, timing);

+ RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation);

double inf = std::numeric_limits<double>::infinity();

EXPECT_EQ(100, animation->timeToForwardsEffectChange());

@@ -388,8 +388,8 @@ TEST_F(AnimationAnimationTest, TimeToEffectChangeWithPlaybackRate)

timing.endDelay = 100;

timing.playbackRate = 2;

timing.fillMode = Timing::FillModeNone;

- RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);

- RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation.get());

+ Animation* animation = Animation::create(0, nullptr, timing);

+ RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation);

double inf = std::numeric_limits<double>::infinity();

EXPECT_EQ(100, animation->timeToForwardsEffectChange());

@@ -421,8 +421,8 @@ TEST_F(AnimationAnimationTest, TimeToEffectChangeWithNegativePlaybackRate)

timing.endDelay = 100;

timing.playbackRate = -2;

timing.fillMode = Timing::FillModeNone;

- RefPtrWillBeRawPtr<Animation> animation = Animation::create(0, nullptr, timing);

- RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation.get());

+ Animation* animation = Animation::create(0, nullptr, timing);

+ RefPtrWillBeRawPtr<AnimationPlayer> player = document.timeline().play(animation);

double inf = std::numeric_limits<double>::infinity();

EXPECT_EQ(100, animation->timeToForwardsEffectChange());

@@ -451,14 +451,11 @@ TEST_F(AnimationAnimationTest, ElementDestructorClearsAnimationTarget)

// and Animation are moved to Oilpan. See crbug.com/362404 for context.

Timing timing;

timing.iterationDuration = 5;

- RefPtrWillBeRawPtr<Animation> animation = Animation::create(element.get(), nullptr, timing);

+ Animation* animation = Animation::create(element.get(), nullptr, timing);

EXPECT_EQ(element.get(), animation->target());

- document.timeline().play(animation.get());

+ document.timeline().play(animation);

pageHolder.clear();

element.clear();

-#if !ENABLE(OILPAN)

- EXPECT_EQ(0, animation->target());

-#endif

}

} // namespace blink