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