| Index: third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp
|
| index 30934e6380435f654294f41ef099e91cc2c65c9a..aa008e9c3cd44c8020a2aaa0e54f3052222e69ea 100644
|
| --- a/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/LengthPairStyleInterpolationTest.cpp
|
| @@ -20,17 +20,17 @@ protected:
|
| return LengthPairStyleInterpolation::lengthPairToInterpolableValue(value);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range)
|
| + static RawPtr<CSSValue> interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range)
|
| {
|
| return LengthPairStyleInterpolation::interpolableValueToLengthPair(value, range);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value, InterpolationRange range)
|
| + static RawPtr<CSSValue> roundTrip(RawPtr<CSSValue> value, InterpolationRange range)
|
| {
|
| return interpolableValueToLengthPair(lengthPairToInterpolableValue(*value).get(), range);
|
| }
|
|
|
| - static void testPrimitiveValue(RefPtrWillBeRawPtr<CSSValue> value, double first, double second, CSSPrimitiveValue::UnitType unitType)
|
| + static void testPrimitiveValue(RawPtr<CSSValue> value, double first, double second, CSSPrimitiveValue::UnitType unitType)
|
| {
|
| EXPECT_TRUE(value->isValuePair());
|
| const CSSValuePair& pair = toCSSValuePair(*value);
|
| @@ -45,43 +45,43 @@ protected:
|
|
|
| TEST_F(LengthPairStyleInterpolationTest, ZeroTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSValuePair> pairPx = CSSValuePair::create(firstPx.release(), secondPx.release(), CSSValuePair::KeepIdenticalValues);
|
| - RefPtrWillBeRawPtr<CSSValue> value1 = roundTrip(pairPx.release(), RangeNonNegative);
|
| + RawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| + RawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| + RawPtr<CSSValuePair> pairPx = CSSValuePair::create(firstPx.release(), secondPx.release(), CSSValuePair::KeepIdenticalValues);
|
| + RawPtr<CSSValue> value1 = roundTrip(pairPx.release(), RangeNonNegative);
|
| testPrimitiveValue(value1, 0, 0, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| - RefPtrWillBeRawPtr<CSSValuePair> pairPc = CSSValuePair::create(firstPc.release(), secondPc.release(), CSSValuePair::KeepIdenticalValues);
|
| - RefPtrWillBeRawPtr<CSSValue> value2 = roundTrip(pairPc.release(), RangeNonNegative);
|
| + RawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| + RawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| + RawPtr<CSSValuePair> pairPc = CSSValuePair::create(firstPc.release(), secondPc.release(), CSSValuePair::KeepIdenticalValues);
|
| + RawPtr<CSSValue> value2 = roundTrip(pairPc.release(), RangeNonNegative);
|
| testPrimitiveValue(value2, 0, 0, CSSPrimitiveValue::UnitType::Percentage);
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> firstEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> secondEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems);
|
| - RefPtrWillBeRawPtr<CSSValuePair> pairEms = CSSValuePair::create(firstEms.release(), secondEms.release(), CSSValuePair::KeepIdenticalValues);
|
| - RefPtrWillBeRawPtr<CSSValue> value3 = roundTrip(pairEms.release(), RangeNonNegative);
|
| + RawPtr<CSSPrimitiveValue> firstEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems);
|
| + RawPtr<CSSPrimitiveValue> secondEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems);
|
| + RawPtr<CSSValuePair> pairEms = CSSValuePair::create(firstEms.release(), secondEms.release(), CSSValuePair::KeepIdenticalValues);
|
| + RawPtr<CSSValue> value3 = roundTrip(pairEms.release(), RangeNonNegative);
|
| testPrimitiveValue(value3, 0, 0, CSSPrimitiveValue::UnitType::Ems);
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| - RefPtrWillBeRawPtr<CSSValuePair> pairPcNeg = CSSValuePair::create(firstPcNeg.release(), secondPcNeg.release(), CSSValuePair::KeepIdenticalValues);
|
| - RefPtrWillBeRawPtr<CSSValue> value4 = roundTrip(pairPcNeg.release(), RangeAll);
|
| + RawPtr<CSSPrimitiveValue> firstPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| + RawPtr<CSSPrimitiveValue> secondPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage);
|
| + RawPtr<CSSValuePair> pairPcNeg = CSSValuePair::create(firstPcNeg.release(), secondPcNeg.release(), CSSValuePair::KeepIdenticalValues);
|
| + RawPtr<CSSValue> value4 = roundTrip(pairPcNeg.release(), RangeAll);
|
| testPrimitiveValue(value4, 0, 0, CSSPrimitiveValue::UnitType::Percentage);
|
| }
|
|
|
| TEST_F(LengthPairStyleInterpolationTest, MultipleValueTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSValuePair> pairPx = CSSValuePair::create(firstPx.release(), secondPx.release(), CSSValuePair::KeepIdenticalValues);
|
| - RefPtrWillBeRawPtr<CSSValue> value5 = roundTrip(pairPx.release(), RangeNonNegative);
|
| + RawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
|
| + RawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
|
| + RawPtr<CSSValuePair> pairPx = CSSValuePair::create(firstPx.release(), secondPx.release(), CSSValuePair::KeepIdenticalValues);
|
| + RawPtr<CSSValue> value5 = roundTrip(pairPx.release(), RangeNonNegative);
|
| testPrimitiveValue(value5, 10, 20, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(-30, CSSPrimitiveValue::UnitType::Percentage);
|
| - RefPtrWillBeRawPtr<CSSValuePair> pairPc = CSSValuePair::create(firstPc.release(), secondPc.release(), CSSValuePair::KeepIdenticalValues);
|
| - RefPtrWillBeRawPtr<CSSValue> value6 = roundTrip(pairPc.release(), RangeNonNegative);
|
| + RawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage);
|
| + RawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(-30, CSSPrimitiveValue::UnitType::Percentage);
|
| + RawPtr<CSSValuePair> pairPc = CSSValuePair::create(firstPc.release(), secondPc.release(), CSSValuePair::KeepIdenticalValues);
|
| + RawPtr<CSSValue> value6 = roundTrip(pairPc.release(), RangeNonNegative);
|
| testPrimitiveValue(value6, 30, 0, CSSPrimitiveValue::UnitType::Percentage);
|
| }
|
|
|
|
|