| Index: Source/core/animation/InterpolationEffectTest.cpp
|
| diff --git a/Source/core/animation/InterpolationEffectTest.cpp b/Source/core/animation/InterpolationEffectTest.cpp
|
| index 07ae4a01a6e620a4d568aaeefcea5fd6096bacc7..4158ac9affc961c8b526720bae711a7e98ac6eca 100644
|
| --- a/Source/core/animation/InterpolationEffectTest.cpp
|
| +++ b/Source/core/animation/InterpolationEffectTest.cpp
|
| @@ -13,9 +13,9 @@ namespace {
|
|
|
| class SampleInterpolation : public Interpolation {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<Interpolation> create(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
|
| + static Interpolation* create(InterpolableValue* start, InterpolableValue* end)
|
| {
|
| - return adoptRefWillBeNoop(new SampleInterpolation(start, end));
|
| + return new SampleInterpolation(start, end);
|
| }
|
|
|
| virtual PropertyHandle property() const override
|
| @@ -23,7 +23,7 @@ public:
|
| return PropertyHandle(CSSPropertyBackgroundColor);
|
| }
|
| private:
|
| - SampleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end)
|
| + SampleInterpolation(InterpolableValue* start, InterpolableValue* end)
|
| : Interpolation(start, end)
|
| {
|
| }
|
| @@ -40,19 +40,19 @@ protected:
|
| return interpolation.getCachedValueForTesting();
|
| }
|
|
|
| - double getInterpolableNumber(PassRefPtrWillBeRawPtr<Interpolation> value)
|
| + double getInterpolableNumber(Interpolation* value)
|
| {
|
| - return toInterpolableNumber(interpolationValue(*value.get()))->value();
|
| + return toInterpolableNumber(interpolationValue(*value))->value();
|
| }
|
| };
|
|
|
| TEST_F(AnimationInterpolationEffectTest, SingleInterpolation)
|
| {
|
| - RefPtrWillBeRawPtr<InterpolationEffect> interpolationEffect = InterpolationEffect::create();
|
| + InterpolationEffect* interpolationEffect = InterpolationEffect::create();
|
| interpolationEffect->addInterpolation(SampleInterpolation::create(InterpolableNumber::create(0), InterpolableNumber::create(10)),
|
| RefPtr<TimingFunction>(), 0, 1, -1, 2);
|
|
|
| - OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> activeInterpolations = nullptr;
|
| + HeapVector<Member<Interpolation>>* activeInterpolations = nullptr;
|
| interpolationEffect->getActiveInterpolations(-2, duration, activeInterpolations);
|
| EXPECT_EQ(0ul, activeInterpolations->size());
|
|
|
| @@ -74,7 +74,7 @@ TEST_F(AnimationInterpolationEffectTest, SingleInterpolation)
|
|
|
| TEST_F(AnimationInterpolationEffectTest, MultipleInterpolations)
|
| {
|
| - RefPtrWillBeRawPtr<InterpolationEffect> interpolationEffect = InterpolationEffect::create();
|
| + InterpolationEffect* interpolationEffect = InterpolationEffect::create();
|
| interpolationEffect->addInterpolation(SampleInterpolation::create(InterpolableNumber::create(10), InterpolableNumber::create(15)),
|
| RefPtr<TimingFunction>(), 1, 2, 1, 3);
|
| interpolationEffect->addInterpolation(SampleInterpolation::create(InterpolableNumber::create(0), InterpolableNumber::create(1)),
|
| @@ -82,7 +82,7 @@ TEST_F(AnimationInterpolationEffectTest, MultipleInterpolations)
|
| interpolationEffect->addInterpolation(SampleInterpolation::create(InterpolableNumber::create(1), InterpolableNumber::create(6)),
|
| CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease), 0.5, 1.5, 0.5, 1.5);
|
|
|
| - OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> activeInterpolations = nullptr;
|
| + HeapVector<Member<Interpolation>>* activeInterpolations = nullptr;
|
| interpolationEffect->getActiveInterpolations(-0.5, duration, activeInterpolations);
|
| EXPECT_EQ(0ul, activeInterpolations->size());
|
|
|
|
|