Index: Source/core/animation/ColorStyleInterpolationTest.cpp |
diff --git a/Source/core/animation/ColorStyleInterpolationTest.cpp b/Source/core/animation/ColorStyleInterpolationTest.cpp |
index 2cf4a04b425ddcc9a39c6073efde1c43ffeb4947..245c9b99f627a7c40ab782769da00bb104d8d9c0 100644 |
--- a/Source/core/animation/ColorStyleInterpolationTest.cpp |
+++ b/Source/core/animation/ColorStyleInterpolationTest.cpp |
@@ -20,20 +20,20 @@ protected: |
return ColorStyleInterpolation::colorToInterpolableValue(value); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToColor(InterpolableValue* value) |
+ static CSSValue interpolableValueToColor(InterpolableValue* value) |
{ |
return ColorStyleInterpolation::interpolableValueToColor(*value); |
} |
- static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value) |
+ static CSSValue roundTrip(CSSValue value) |
{ |
- return interpolableValueToColor(colorToInterpolableValue(*value).get()); |
+ return interpolableValueToColor(colorToInterpolableValue(value).get()); |
} |
- static void testPrimitiveValue(PassRefPtrWillBeRawPtr<CSSValue> value, RGBA32 rgbaValue) |
+ static void testPrimitiveValue(CSSValue value, RGBA32 rgbaValue) |
{ |
- EXPECT_TRUE(value->isPrimitiveValue()); |
- EXPECT_EQ(toCSSPrimitiveValue(value.get())->getRGBA32Value(), rgbaValue); |
+ EXPECT_TRUE(value.isPrimitiveValue()); |
+ EXPECT_EQ(toCSSPrimitiveValue(value).getRGBA32Value(), rgbaValue); |
} |
static InterpolableValue* interpolationValue(Interpolation& interpolation) |
@@ -44,13 +44,13 @@ protected: |
TEST_F(AnimationColorStyleInterpolationTest, Color) |
{ |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64))); |
+ CSSValue value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64))); |
testPrimitiveValue(value, makeRGBA(54, 48, 214, 64)); |
} |
TEST_F(AnimationColorStyleInterpolationTest, ClampedColor) |
{ |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(-10, -10, -10, -10))); |
+ CSSValue value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(-10, -10, -10, -10))); |
testPrimitiveValue(value, makeRGBA(-10, -10, -10, -10)); |
value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(-260, -260, -260, -260))); |
@@ -59,26 +59,26 @@ TEST_F(AnimationColorStyleInterpolationTest, ClampedColor) |
TEST_F(AnimationColorStyleInterpolationTest, ZeroAlpha) |
{ |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(54, 58, 214, 0))); |
+ CSSValue value = roundTrip(CSSPrimitiveValue::createColor(makeRGBA(54, 58, 214, 0))); |
testPrimitiveValue(value, Color::transparent); |
} |
TEST_F(AnimationColorStyleInterpolationTest, ValueIDColor) |
{ |
- RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::createIdentifier(CSSValueID::CSSValueBlue)); |
+ CSSValue value = roundTrip(CSSPrimitiveValue::createIdentifier(CSSValueID::CSSValueBlue)); |
testPrimitiveValue(value, makeRGB(0, 0, 255)); |
} |
TEST_F(AnimationColorStyleInterpolationTest, Interpolation) |
{ |
RefPtrWillBeRawPtr<Interpolation> interpolation = ColorStyleInterpolation::create( |
- *CSSPrimitiveValue::createColor(makeRGBA(0, 0, 0, 255)), |
- *CSSPrimitiveValue::createColor(makeRGBA(255, 255, 255, 255)), |
+ CSSPrimitiveValue::createColor(makeRGBA(0, 0, 0, 255)), |
+ CSSPrimitiveValue::createColor(makeRGBA(255, 255, 255, 255)), |
CSSPropertyColor |
); |
interpolation->interpolate(0, 0.5); |
- RefPtrWillBeRawPtr<CSSValue> value = interpolableValueToColor(interpolationValue(*interpolation)); |
+ CSSValue value = interpolableValueToColor(interpolationValue(*interpolation)); |
testPrimitiveValue(value, makeRGBA(128, 128, 128, 255)); |
} |