| Index: third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| index 3166c103ff754a13cc0a4a6737f042a892ba3dd2..b6223f167916a033050ea34ec859a62db0c2a7b6 100644
|
| --- a/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| @@ -24,34 +24,34 @@ protected:
|
| return DoubleStyleInterpolation::motionRotationToInterpolableValue(value);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
|
| + static RawPtr<CSSValue> interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
|
| {
|
| return DoubleStyleInterpolation::interpolableValueToDouble(value, isNumber, clamp);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
|
| + static RawPtr<CSSValue> interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
|
| {
|
| return DoubleStyleInterpolation::interpolableValueToMotionRotation(value, flag);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value)
|
| + static RawPtr<CSSValue> roundTrip(RawPtr<CSSValue> value)
|
| {
|
| return interpolableValueToDouble(doubleToInterpolableValue(*value).get(), toCSSPrimitiveValue(value.get())->isNumber(), RangeAll);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTripMotionRotation(PassRefPtrWillBeRawPtr<CSSValue> value, bool flag)
|
| + static RawPtr<CSSValue> roundTripMotionRotation(RawPtr<CSSValue> value, bool flag)
|
| {
|
| return interpolableValueToMotionRotation(motionRotationToInterpolableValue(*value).get(), flag);
|
| }
|
|
|
| - static void testPrimitiveValue(RefPtrWillBeRawPtr<CSSValue> value, double doubleValue, CSSPrimitiveValue::UnitType unitType)
|
| + static void testPrimitiveValue(RawPtr<CSSValue> value, double doubleValue, CSSPrimitiveValue::UnitType unitType)
|
| {
|
| EXPECT_TRUE(value->isPrimitiveValue());
|
| EXPECT_EQ(doubleValue, toCSSPrimitiveValue(value.get())->getDoubleValue());
|
| EXPECT_EQ(unitType, toCSSPrimitiveValue(value.get())->typeWithCalcResolved());
|
| }
|
|
|
| - static void testValueListMotionRotation(RefPtrWillBeRawPtr<CSSValue> value, double doubleValue, bool flag)
|
| + static void testValueListMotionRotation(RawPtr<CSSValue> value, double doubleValue, bool flag)
|
| {
|
| EXPECT_TRUE(value->isValueList());
|
| const CSSValueList& list = toCSSValueList(*value);
|
| @@ -79,13 +79,13 @@ protected:
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValue)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Number));
|
| + RawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Number));
|
| testPrimitiveValue(value, 0, CSSPrimitiveValue::UnitType::Number);
|
| }
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, AngleValue)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Degrees));
|
| + RawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Degrees));
|
| testPrimitiveValue(value, 10, CSSPrimitiveValue::UnitType::Degrees);
|
|
|
| value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Radians));
|
| @@ -110,35 +110,35 @@ TEST_F(AnimationDoubleStyleInterpolationTest, Clamping)
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueFixedMotionRotation)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Degrees));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), false);
|
| + RawPtr<CSSValue> value = roundTripMotionRotation(list.release(), false);
|
| testValueListMotionRotation(value, 0, false);
|
| }
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueAutoMotionRotation)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto));
|
| list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Degrees));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), true);
|
| + RawPtr<CSSValue> value = roundTripMotionRotation(list.release(), true);
|
| testValueListMotionRotation(value, 0, true);
|
| }
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, ValueFixedMotionRotation)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::UnitType::Degrees));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), false);
|
| + RawPtr<CSSValue> value = roundTripMotionRotation(list.release(), false);
|
| testValueListMotionRotation(value, 90, false);
|
| }
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, ValueAutoMotionRotation)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto));
|
| list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::UnitType::Degrees));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), true);
|
| + RawPtr<CSSValue> value = roundTripMotionRotation(list.release(), true);
|
| testValueListMotionRotation(value, 90, true);
|
| }
|
|
|
|
|