| Index: Source/core/animation/LengthStyleInterpolationTest.cpp
|
| diff --git a/Source/core/animation/LengthStyleInterpolationTest.cpp b/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| index 9117139cb1b97f7bf480f14467738dc2b8fb94de..a1a20005d30fda1f5cf75beaf141714817c3b059 100644
|
| --- a/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| +++ b/Source/core/animation/LengthStyleInterpolationTest.cpp
|
| @@ -14,24 +14,24 @@ namespace blink {
|
|
|
| class AnimationLengthStyleInterpolationTest : public ::testing::Test {
|
| protected:
|
| - static PassOwnPtrWillBeRawPtr<InterpolableValue> lengthToInterpolableValue(const CSSValue& value)
|
| + static PassOwnPtr<InterpolableValue> lengthToInterpolableValue(const CSSValue& value)
|
| {
|
| return LengthStyleInterpolation::toInterpolableValue(value);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToLength(InterpolableValue* value, InterpolationRange range)
|
| + static PassRefPtr<CSSValue> interpolableValueToLength(InterpolableValue* value, InterpolationRange range)
|
| {
|
| return LengthStyleInterpolation::fromInterpolableValue(*value, range);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value)
|
| + static PassRefPtr<CSSValue> roundTrip(PassRefPtr<CSSValue> value)
|
| {
|
| return interpolableValueToLength(lengthToInterpolableValue(*value).get(), RangeAll);
|
| }
|
|
|
| - static PassOwnPtrWillBeRawPtr<InterpolableList> createInterpolableLength(double a, double b, double c, double d, double e, double f, double g, double h, double i, double j)
|
| + static PassOwnPtr<InterpolableList> createInterpolableLength(double a, double b, double c, double d, double e, double f, double g, double h, double i, double j)
|
| {
|
| - OwnPtrWillBeRawPtr<InterpolableList> list = InterpolableList::create(10);
|
| + OwnPtr<InterpolableList> list = InterpolableList::create(10);
|
| list->set(0, InterpolableNumber::create(a));
|
| list->set(1, InterpolableNumber::create(b));
|
| list->set(2, InterpolableNumber::create(c));
|
| @@ -76,19 +76,19 @@ protected:
|
|
|
| TEST_F(AnimationLengthStyleInterpolationTest, ZeroLength)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels));
|
| + RefPtr<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));
|
| + RefPtr<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));
|
| + RefPtr<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));
|
| + RefPtr<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));
|
| @@ -100,11 +100,11 @@ TEST_F(AnimationLengthStyleInterpolationTest, SingleUnit)
|
|
|
| TEST_F(AnimationLengthStyleInterpolationTest, SingleClampedUnit)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValue> value1 = CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<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);
|
| + RefPtr<CSSValue> value2 = CSSPrimitiveValue::create(-10, CSSPrimitiveValue::UnitType::Ems);
|
| value2 = interpolableValueToLength(lengthToInterpolableValue(*value2).get(), RangeNonNegative);
|
| TEST_PRIMITIVE_VALUE(value2, 0, CSSPrimitiveValue::UnitType::Ems);
|
| }
|
| @@ -113,7 +113,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnits)
|
| {
|
| CSSLengthArray expectation, actual;
|
| initLengthArray(expectation);
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(2);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(2);
|
| result->set(0, createInterpolableLength(0, 10, 0, 10, 0, 10, 0, 10, 0, 10));
|
| result->set(1, createInterpolableLength(0, 1, 0, 1, 0, 1, 0, 1, 0, 1));
|
| toCSSPrimitiveValue(interpolableValueToLength(result.get(), RangeAll).get())->accumulateLengthArray(expectation);
|
| @@ -125,7 +125,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnitsWithSingleValues)
|
| {
|
| CSSLengthArray expectation, actual;
|
| initLengthArray(expectation);
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(2);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(2);
|
| result->set(0, createInterpolableLength(0, 10, 0, 10, 0, 10, 0, 10, 0, 10));
|
| result->set(1, createInterpolableLength(0, 1, 0, 1, 0, 1, 0, 1, 0, 1));
|
| toCSSPrimitiveValue(interpolableValueToLength(result.get(), RangeAll).get())->accumulateLengthArray(expectation);
|
| @@ -137,7 +137,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnitsWithMultipleValues)
|
| {
|
| CSSLengthArray expectation, actual;
|
| initLengthArray(expectation);
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(2);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(2);
|
| result->set(0, createInterpolableLength(0, 20, 0, 30, 0, 8, 0, 10, 0, 7));
|
| result->set(1, createInterpolableLength(0, 1, 0, 1, 0, 1, 0, 1, 0, 1));
|
| toCSSPrimitiveValue(interpolableValueToLength(result.get(), RangeAll).get())->accumulateLengthArray(expectation);
|
| @@ -149,7 +149,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnitsWithZeroValue)
|
| {
|
| CSSLengthArray expectation, actual;
|
| initLengthArray(expectation);
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(2);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(2);
|
| result->set(0, createInterpolableLength(0, 10, 0, 10, 0, 10, 0, 10, 0, 10));
|
| result->set(1, createInterpolableLength(1, 1, 0, 1, 0, 1, 0, 1, 0, 1));
|
| toCSSPrimitiveValue(interpolableValueToLength(result.get(), RangeAll).get())->accumulateLengthArray(expectation);
|
| @@ -161,7 +161,7 @@ TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnitsWithZeroValues)
|
| {
|
| CSSLengthArray expectation, actual;
|
| initLengthArray(expectation);
|
| - OwnPtrWillBeRawPtr<InterpolableList> result = InterpolableList::create(2);
|
| + OwnPtr<InterpolableList> result = InterpolableList::create(2);
|
| result->set(0, createInterpolableLength(0, 10, 0, 10, 0, 10, 0, 10, 0, 10));
|
| result->set(1, createInterpolableLength(1, 1, 1, 1, 0, 1, 0, 1, 1, 1));
|
| toCSSPrimitiveValue(interpolableValueToLength(result.get(), RangeAll).get())->accumulateLengthArray(expectation);
|
|
|