Index: Source/core/animation/LengthPairStyleInterpolationTest.cpp |
diff --git a/Source/core/animation/LengthPairStyleInterpolationTest.cpp b/Source/core/animation/LengthPairStyleInterpolationTest.cpp |
index e2cef4f9a2658231eb68cbcbc9b85d2008a22be9..a53f4453b7f6fac2af0c459ced50cdad9a425822 100644 |
--- a/Source/core/animation/LengthPairStyleInterpolationTest.cpp |
+++ b/Source/core/animation/LengthPairStyleInterpolationTest.cpp |
@@ -17,22 +17,22 @@ namespace blink { |
class LengthPairStyleInterpolationTest : public ::testing::Test { |
protected: |
- static PassOwnPtrWillBeRawPtr<InterpolableValue> lengthPairToInterpolableValue(const CSSValue& value) |
+ static PassOwnPtr<InterpolableValue> lengthPairToInterpolableValue(const CSSValue& value) |
{ |
return LengthPairStyleInterpolation::lengthPairToInterpolableValue(value); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range) |
+ static PassRefPtr<CSSValue> interpolableValueToLengthPair(InterpolableValue* value, InterpolationRange range) |
{ |
return LengthPairStyleInterpolation::interpolableValueToLengthPair(value, range); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value, InterpolationRange range) |
+ static PassRefPtr<CSSValue> roundTrip(PassRefPtr<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(RefPtr<CSSValue> value, double first, double second, CSSPrimitiveValue::UnitType unitType) |
{ |
EXPECT_TRUE(value->isPrimitiveValue()); |
@@ -49,43 +49,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<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::KeepIdenticalValues); |
- RefPtrWillBeRawPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(pairPx.release()), RangeNonNegative); |
+ RefPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels); |
+ RefPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels); |
+ RefPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::KeepIdenticalValues); |
+ RefPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(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<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::KeepIdenticalValues); |
- RefPtrWillBeRawPtr<CSSValue> value2 = roundTrip(CSSPrimitiveValue::create(pairPc.release()), RangeNonNegative); |
+ RefPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage); |
+ RefPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage); |
+ RefPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::KeepIdenticalValues); |
+ RefPtr<CSSValue> value2 = roundTrip(CSSPrimitiveValue::create(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<Pair> pairEms = Pair::create(firstEms, secondEms, Pair::KeepIdenticalValues); |
- RefPtrWillBeRawPtr<CSSValue> value3 = roundTrip(CSSPrimitiveValue::create(pairEms.release()), RangeNonNegative); |
+ RefPtr<CSSPrimitiveValue> firstEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems); |
+ RefPtr<CSSPrimitiveValue> secondEms = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Ems); |
+ RefPtr<Pair> pairEms = Pair::create(firstEms, secondEms, Pair::KeepIdenticalValues); |
+ RefPtr<CSSValue> value3 = roundTrip(CSSPrimitiveValue::create(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<Pair> pairPcNeg = Pair::create(firstPcNeg, secondPcNeg, Pair::KeepIdenticalValues); |
- RefPtrWillBeRawPtr<CSSValue> value4 = roundTrip(CSSPrimitiveValue::create(pairPcNeg.release()), RangeAll); |
+ RefPtr<CSSPrimitiveValue> firstPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage); |
+ RefPtr<CSSPrimitiveValue> secondPcNeg = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Percentage); |
+ RefPtr<Pair> pairPcNeg = Pair::create(firstPcNeg, secondPcNeg, Pair::KeepIdenticalValues); |
+ RefPtr<CSSValue> value4 = roundTrip(CSSPrimitiveValue::create(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<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::KeepIdenticalValues); |
- RefPtrWillBeRawPtr<CSSValue> value5 = roundTrip(CSSPrimitiveValue::create(pairPx.release()), RangeNonNegative); |
+ RefPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels); |
+ RefPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels); |
+ RefPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::KeepIdenticalValues); |
+ RefPtr<CSSValue> value5 = roundTrip(CSSPrimitiveValue::create(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<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::KeepIdenticalValues); |
- RefPtrWillBeRawPtr<CSSValue> value6 = roundTrip(CSSPrimitiveValue::create(pairPc.release()), RangeNonNegative); |
+ RefPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Percentage); |
+ RefPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(-30, CSSPrimitiveValue::UnitType::Percentage); |
+ RefPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::KeepIdenticalValues); |
+ RefPtr<CSSValue> value6 = roundTrip(CSSPrimitiveValue::create(pairPc.release()), RangeNonNegative); |
testPrimitiveValue(value6, 30, 0, CSSPrimitiveValue::UnitType::Percentage); |
} |