| Index: Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| diff --git a/Source/core/animation/ShadowStyleInterpolationTest.cpp b/Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| index 80e5d240c1a3b319213fbc0d65b96c973fda1748..0b34f742db5d000addaa73ab1152e5e384b9c76d 100644
|
| --- a/Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| +++ b/Source/core/animation/ShadowStyleInterpolationTest.cpp
|
| @@ -35,35 +35,35 @@ protected:
|
| }
|
|
|
| static void testPrimitiveValues(CSSValue value, double xExpected, double yExpected, double blurExpected, double spreadExpected,
|
| - RGBA32 colorExpected, RefPtrWillBeRawPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)
|
| + RGBA32 colorExpected, CSSPrimitiveValue idExpected, CSSPrimitiveValue::UnitType unitType)
|
| {
|
| EXPECT_TRUE(value.isShadowValue());
|
|
|
| CSSShadowValue& shadowValue = toCSSShadowValue(value);
|
|
|
| - EXPECT_EQ(xExpected, shadowValue.x->getDoubleValue());
|
| - EXPECT_EQ(yExpected, shadowValue.y->getDoubleValue());
|
| - EXPECT_EQ(blurExpected, shadowValue.blur->getDoubleValue());
|
| - EXPECT_EQ(spreadExpected, shadowValue.spread->getDoubleValue());
|
| - EXPECT_EQ(colorExpected, shadowValue.color->getRGBA32Value());
|
| + EXPECT_EQ(xExpected, toCSSPrimitiveValue(shadowValue.x).getDoubleValue());
|
| + EXPECT_EQ(yExpected, toCSSPrimitiveValue(shadowValue.y).getDoubleValue());
|
| + EXPECT_EQ(blurExpected, toCSSPrimitiveValue(shadowValue.blur).getDoubleValue());
|
| + EXPECT_EQ(spreadExpected, toCSSPrimitiveValue(shadowValue.spread).getDoubleValue());
|
| + EXPECT_EQ(colorExpected, toCSSPrimitiveValue(shadowValue.color).getRGBA32Value());
|
|
|
| - EXPECT_EQ(idExpected->getValueID(), shadowValue.style->getValueID());
|
| + EXPECT_EQ(idExpected.getValueID(), toCSSPrimitiveValue(shadowValue.style).getValueID());
|
|
|
| - EXPECT_EQ(shadowValue.x->primitiveType(), unitType);
|
| - EXPECT_EQ(shadowValue.y->primitiveType(), unitType);
|
| - EXPECT_EQ(shadowValue.blur->primitiveType(), unitType);
|
| - EXPECT_EQ(shadowValue.spread->primitiveType(), unitType);
|
| + EXPECT_EQ(toCSSPrimitiveValue(shadowValue.x).primitiveType(), unitType);
|
| + EXPECT_EQ(toCSSPrimitiveValue(shadowValue.y).primitiveType(), unitType);
|
| + EXPECT_EQ(toCSSPrimitiveValue(shadowValue.blur).primitiveType(), unitType);
|
| + EXPECT_EQ(toCSSPrimitiveValue(shadowValue.spread).primitiveType(), unitType);
|
| }
|
|
|
| };
|
|
|
| TEST_F(AnimationShadowStyleInterpolationTest, ZeroTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(0, 0, 0, 0));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue color = CSSPrimitiveValue::createColor(makeRGBA(0, 0, 0, 0));
|
| + CSSPrimitiveValue x = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue y = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue blur = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue spread = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);
|
|
|
| RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
|
|
| @@ -74,11 +74,11 @@ TEST_F(AnimationShadowStyleInterpolationTest, ZeroTest)
|
|
|
| TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_EMS);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_EMS);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_EMS);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_EMS);
|
| + CSSPrimitiveValue color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
|
| + CSSPrimitiveValue x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_EMS);
|
| + CSSPrimitiveValue y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_EMS);
|
| + CSSPrimitiveValue blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_EMS);
|
| + CSSPrimitiveValue spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_EMS);
|
|
|
| RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
|
|
|
| @@ -89,11 +89,11 @@ TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)
|
|
|
| TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64));
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PX);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue color = CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64));
|
| + CSSPrimitiveValue x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PX);
|
| + CSSPrimitiveValue spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_PX);
|
|
|
| RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);
|
|
|
|
|