| Index: Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| diff --git a/Source/core/animation/DoubleStyleInterpolationTest.cpp b/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| index 9b1d03b4cab65be1bc31034ac51f9bc3922e6496..7eba8236a4487fd1de6e539a3eede65e9a1741f6 100644
|
| --- a/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| +++ b/Source/core/animation/DoubleStyleInterpolationTest.cpp
|
| @@ -26,38 +26,38 @@ protected:
|
| return DoubleStyleInterpolation::motionRotationToInterpolableValue(value);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
|
| + static CSSValue interpolableValueToDouble(InterpolableValue* value, bool isNumber, InterpolationRange clamp)
|
| {
|
| return DoubleStyleInterpolation::interpolableValueToDouble(value, isNumber, clamp);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
|
| + static CSSValue interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
|
| {
|
| return DoubleStyleInterpolation::interpolableValueToMotionRotation(value, flag);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value)
|
| + static CSSValue roundTrip(CSSValue value)
|
| {
|
| - return interpolableValueToDouble(doubleToInterpolableValue(*value).get(), toCSSPrimitiveValue(value.get())->primitiveType() == CSSPrimitiveValue::CSS_NUMBER, RangeAll);
|
| + return interpolableValueToDouble(doubleToInterpolableValue(value).get(), toCSSPrimitiveValue(value).primitiveType() == CSSPrimitiveValue::CSS_NUMBER, RangeAll);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTripMotionRotation(PassRefPtrWillBeRawPtr<CSSValue> value, bool flag)
|
| + static CSSValue roundTripMotionRotation(CSSValue value, bool flag)
|
| {
|
| - return interpolableValueToMotionRotation(motionRotationToInterpolableValue(*value).get(), flag);
|
| + return interpolableValueToMotionRotation(motionRotationToInterpolableValue(value).get(), flag);
|
| }
|
|
|
| - static void testPrimitiveValue(RefPtrWillBeRawPtr<CSSValue> value, double doubleValue, CSSPrimitiveValue::UnitType unitType)
|
| + static void testPrimitiveValue(CSSValue value, double doubleValue, CSSPrimitiveValue::UnitType unitType)
|
| {
|
| - EXPECT_TRUE(value->isPrimitiveValue());
|
| - EXPECT_EQ(doubleValue, toCSSPrimitiveValue(value.get())->getDoubleValue());
|
| - EXPECT_EQ(unitType, toCSSPrimitiveValue(value.get())->primitiveType());
|
| + EXPECT_TRUE(value.isPrimitiveValue());
|
| + EXPECT_EQ(doubleValue, toCSSPrimitiveValue(value).getDoubleValue());
|
| + EXPECT_EQ(unitType, toCSSPrimitiveValue(value).primitiveType());
|
| }
|
|
|
| - static void testValueListMotionRotation(RefPtrWillBeRawPtr<CSSValue> value, double doubleValue, bool flag)
|
| + static void testValueListMotionRotation(CSSValue value, double doubleValue, bool flag)
|
| {
|
| - EXPECT_TRUE(value->isValueList());
|
| - const CSSValueList& list = toCSSValueList(*value);
|
| - const CSSValue* item;
|
| + EXPECT_TRUE(value.isValueList());
|
| + const CSSValueList& list = toCSSValueList(value);
|
| + NullableCSSValue item;
|
| if (flag) {
|
| EXPECT_EQ(2U, list.length());
|
| item = list.item(0);
|
| @@ -81,13 +81,13 @@ protected:
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValue)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_NUMBER));
|
| + CSSValue value = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_NUMBER));
|
| testPrimitiveValue(value, 0, CSSPrimitiveValue::CSS_NUMBER);
|
| }
|
|
|
| TEST_F(AnimationDoubleStyleInterpolationTest, AngleValue)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_DEG));
|
| + CSSValue value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_DEG));
|
| testPrimitiveValue(value, 10, CSSPrimitiveValue::CSS_DEG);
|
|
|
| value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_RAD));
|
| @@ -100,8 +100,8 @@ TEST_F(AnimationDoubleStyleInterpolationTest, AngleValue)
|
| TEST_F(AnimationDoubleStyleInterpolationTest, Clamping)
|
| {
|
| RefPtrWillBeRawPtr<Interpolation> interpolableDouble = DoubleStyleInterpolation::create(
|
| - *CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_NUMBER),
|
| - *CSSPrimitiveValue::create(0.6, CSSPrimitiveValue::CSS_NUMBER),
|
| + CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_NUMBER),
|
| + CSSPrimitiveValue::create(0.6, CSSPrimitiveValue::CSS_NUMBER),
|
| CSSPropertyLineHeight,
|
| CSSPrimitiveValue::CSS_NUMBER,
|
| RangeAll);
|
| @@ -114,7 +114,7 @@ TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueFixedMotionRotation)
|
| {
|
| RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_DEG));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), false);
|
| + CSSValue value = roundTripMotionRotation(list.release(), false);
|
| testValueListMotionRotation(value, 0, false);
|
| }
|
|
|
| @@ -123,7 +123,7 @@ TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueAutoMotionRotation)
|
| RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto));
|
| list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_DEG));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), true);
|
| + CSSValue value = roundTripMotionRotation(list.release(), true);
|
| testValueListMotionRotation(value, 0, true);
|
| }
|
|
|
| @@ -131,7 +131,7 @@ TEST_F(AnimationDoubleStyleInterpolationTest, ValueFixedMotionRotation)
|
| {
|
| RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::CSS_DEG));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), false);
|
| + CSSValue value = roundTripMotionRotation(list.release(), false);
|
| testValueListMotionRotation(value, 90, false);
|
| }
|
|
|
| @@ -140,7 +140,7 @@ TEST_F(AnimationDoubleStyleInterpolationTest, ValueAutoMotionRotation)
|
| RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto));
|
| list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::CSS_DEG));
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTripMotionRotation(list.release(), true);
|
| + CSSValue value = roundTripMotionRotation(list.release(), true);
|
| testValueListMotionRotation(value, 90, true);
|
| }
|
|
|
|
|