| Index: third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| index 295540d2f2557d1b87975208ae6f826504b1988d..13646f269127fc5a9f17bfceb4ef221f54aeab14 100644
|
| --- a/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| @@ -17,12 +17,12 @@ protected:
|
| return LengthStyleInterpolation::toInterpolableValue(value);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLength(InterpolableValue* value, InterpolationRange range)
|
| + static RawPtr<CSSValue> interpolableValueToLength(InterpolableValue* value, InterpolationRange range)
|
| {
|
| return LengthStyleInterpolation::fromInterpolableValue(*value, range);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value)
|
| + static RawPtr<CSSValue> roundTrip(RawPtr<CSSValue> value)
|
| {
|
| return interpolableValueToLength(lengthToInterpolableValue(*value).get(), RangeAll);
|
| }
|
| @@ -55,7 +55,7 @@ protected:
|
| {
|
| CSSPrimitiveValue::CSSLengthTypeArray lengthTypeArray;
|
| initLengthArray(lengthArray);
|
| - RefPtrWillBeRawPtr<MutableStylePropertySet> propertySet = MutableStylePropertySet::create(HTMLQuirksMode);
|
| + RawPtr<MutableStylePropertySet> propertySet = MutableStylePropertySet::create(HTMLQuirksMode);
|
| propertySet->setProperty(CSSPropertyLeft, text);
|
| toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft).get())->accumulateLengthArray(lengthArray);
|
| return lengthArray;
|
| @@ -74,19 +74,19 @@ protected:
|
|
|
| TEST_F(AnimationLengthStyleInterpolationTest, ZeroLength)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels));
|
| + RawPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels));
|
| TEST_PRIMITIVE_VALUE(value1, 0, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value2 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage));
|
| + RawPtr<CSSValue> value2 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage));
|
| TEST_PRIMITIVE_VALUE(value2, 0, CSSPrimitiveValue::UnitType::Percentage);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value3 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems));
|
| + RawPtr<CSSValue> value3 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems));
|
| TEST_PRIMITIVE_VALUE(value3, 0, CSSPrimitiveValue::UnitType::Ems);
|
| }
|
|
|
| TEST_F(AnimationLengthStyleInterpolationTest, SingleUnit)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels));
|
| + RawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels));
|
| TEST_PRIMITIVE_VALUE(value, 10, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| value = roundTrip(CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage));
|
| @@ -98,11 +98,11 @@ TEST_F(AnimationLengthStyleInterpolationTest, SingleUnit)
|
|
|
| TEST_F(AnimationLengthStyleInterpolationTest, SingleClampedUnit)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value1 = CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Pixels);
|
| + RawPtr<CSSValue> value1 = CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Pixels);
|
| value1 = interpolableValueToLength(lengthToInterpolableValue(*value1).get(), RangeNonNegative);
|
| TEST_PRIMITIVE_VALUE(value1, 0, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value2 = CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Ems);
|
| + RawPtr<CSSValue> value2 = CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Ems);
|
| value2 = interpolableValueToLength(lengthToInterpolableValue(*value2).get(), RangeNonNegative);
|
| TEST_PRIMITIVE_VALUE(value2, 0, CSSPrimitiveValue::UnitType::Ems);
|
| }
|
|
|