| Index: Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| diff --git a/Source/core/animation/ShadowStyleInterpolationTest.cpp b/Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| index b218dda741e229363b919728725a2f477b09c00c..00137cc1a73bcb3a4dc49da0dbd94389b9630e94 100644
|
| --- a/Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| +++ b/Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| @@ -19,23 +19,23 @@ class AnimationShadowStyleInterpolationTest : public ::testing::Test {
|
|
|
| protected:
|
|
|
| - static PassOwnPtrWillBeRawPtr<InterpolableValue> shadowToInterpolableValue(const CSSValue& value, bool styleFlag)
|
| + static PassOwnPtr<InterpolableValue> shadowToInterpolableValue(const CSSValue& value, bool styleFlag)
|
| {
|
| return ShadowStyleInterpolation::shadowToInterpolableValue(value, styleFlag);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToShadow(InterpolableValue* value, bool styleFlag)
|
| + static PassRefPtr<CSSValue> interpolableValueToShadow(InterpolableValue* value, bool styleFlag)
|
| {
|
| return ShadowStyleInterpolation::interpolableValueToShadow(*value, styleFlag);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value, bool styleFlag)
|
| + static PassRefPtr<CSSValue> roundTrip(PassRefPtr<CSSValue> value, bool styleFlag)
|
| {
|
| return interpolableValueToShadow(shadowToInterpolableValue(*value, styleFlag).get(), styleFlag);
|
| }
|
|
|
| - static void testPrimitiveValues(RefPtrWillBeRawPtr<CSSValue> value, double xExpected, double yExpected, double blurExpected, double spreadExpected,
|
| - RGBA32 colorExpected, RefPtrWillBeRawPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)
|
| + static void testPrimitiveValues(RefPtr<CSSValue> value, double xExpected, double yExpected, double blurExpected, double spreadExpected,
|
| + RGBA32 colorExpected, RefPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)
|
| {
|
| EXPECT_TRUE(value->isShadowValue());
|
|
|
| @@ -59,45 +59,45 @@ protected:
|
|
|
| TEST_F(AnimationShadowStyleInterpolationTest, ZeroTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(0, 0, 0, 0));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(0, 0, 0, 0));
|
| + RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
| + RefPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false);
|
| + RefPtr<CSSValue> value = roundTrip(shadowValue.release(), false);
|
|
|
| testPrimitiveValues(value, 0, 0, 0, 0, makeRGBA(0, 0, 0, 0), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Pixels);
|
| }
|
|
|
| TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Ems);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Ems);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Ems);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Ems);
|
| + RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
|
| + RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Ems);
|
| + RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Ems);
|
| + RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Ems);
|
| + RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Ems);
|
|
|
| - RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
| + RefPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false);
|
| + RefPtr<CSSValue> value = roundTrip(shadowValue.release(), false);
|
|
|
| testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(112, 123, 175, 255), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Ems);
|
| }
|
|
|
| TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Pixels);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64));
|
| + RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Pixels);
|
| + RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);
|
| + RefPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), true);
|
| + RefPtr<CSSValue> value = roundTrip(shadowValue.release(), true);
|
|
|
| testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(54, 48, 214, 64), CSSPrimitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::UnitType::Pixels);
|
| }
|
|
|