Index: Source/core/animation/InterpolationEffectTest.cpp |
diff --git a/Source/core/animation/InterpolationEffectTest.cpp b/Source/core/animation/InterpolationEffectTest.cpp |
index 2c3ce60837b9b736b5edb2b66c68fd8e5ccae22b..d4c5e96557989cd8043c2624a0d1138aad7b959f 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 PassRefPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end) |
{ |
- return adoptRefWillBeNoop(new SampleInterpolation(start, end)); |
+ return adoptRef(new SampleInterpolation(start, end)); |
} |
PropertyHandle property() const override |
@@ -23,7 +23,7 @@ public: |
return PropertyHandle(CSSPropertyBackgroundColor); |
} |
private: |
- SampleInterpolation(PassOwnPtrWillBeRawPtr<InterpolableValue> start, PassOwnPtrWillBeRawPtr<InterpolableValue> end) |
+ SampleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<InterpolableValue> end) |
: Interpolation(start, end) |
{ |
} |
@@ -40,7 +40,7 @@ protected: |
return interpolation.getCachedValueForTesting(); |
} |
- double getInterpolableNumber(PassRefPtrWillBeRawPtr<Interpolation> value) |
+ double getInterpolableNumber(PassRefPtr<Interpolation> value) |
{ |
return toInterpolableNumber(interpolationValue(*value.get()))->value(); |
} |
@@ -48,11 +48,11 @@ protected: |
TEST_F(AnimationInterpolationEffectTest, SingleInterpolation) |
{ |
- InterpolationEffect* interpolationEffect = InterpolationEffect::create(); |
+ RefPtr<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; |
+ OwnPtr<Vector<RefPtr<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) |
{ |
- InterpolationEffect* interpolationEffect = InterpolationEffect::create(); |
+ RefPtr<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; |
+ OwnPtr<Vector<RefPtr<Interpolation>>> activeInterpolations = nullptr; |
interpolationEffect->getActiveInterpolations(-0.5, duration, activeInterpolations); |
EXPECT_EQ(0ul, activeInterpolations->size()); |