Changed CSSColorValue to return a Color

third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp

Index: third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp
index 43dea03217c9b0d99568475aeeb6181181cc453c..aaa6733dd9c1d29212bfba910028726c58f06f1d 100644
--- a/third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp
+++ b/third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp
@@ -31,7 +31,7 @@ protected:
         return interpolableValueToColor(colorToInterpolableValue(*value).get());
     }
 
-    static void testColorValue(PassRefPtrWillBeRawPtr<CSSValue> value, RGBA32 rgbaValue)
+    static void testColorValue(PassRefPtrWillBeRawPtr<CSSValue> value, Color rgbaValue)
     {
         EXPECT_TRUE(value->isColorValue());
         EXPECT_EQ(toCSSColorValue(*value).value(), rgbaValue);
@@ -46,16 +46,16 @@ protected:
 TEST_F(AnimationColorStyleInterpolationTest, Color)
 {
     RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSColorValue::create(makeRGBA(54, 48, 214, 64)));
-    testColorValue(value, makeRGBA(54, 48, 214, 64));
+    testColorValue(value, Color(54, 48, 214, 64));
 }
 
 TEST_F(AnimationColorStyleInterpolationTest, ClampedColor)
 {
     RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSColorValue::create(makeRGBA(-10, -10, -10, -10)));
-    testColorValue(value, makeRGBA(-10, -10, -10, -10));
+    testColorValue(value, Color(-10, -10, -10, -10));
 
     value = roundTrip(CSSColorValue::create(makeRGBA(-260, -260, -260, -260)));
-    testColorValue(value, makeRGBA(-260, -260, -260, -260));
+    testColorValue(value, Color(-260, -260, -260, -260));
 }
 
 TEST_F(AnimationColorStyleInterpolationTest, ZeroAlpha)
@@ -67,20 +67,20 @@ TEST_F(AnimationColorStyleInterpolationTest, ZeroAlpha)
 TEST_F(AnimationColorStyleInterpolationTest, ValueIDColor)
 {
     RefPtrWillBeRawPtr<CSSValue> value = roundTrip(CSSPrimitiveValue::createIdentifier(CSSValueID::CSSValueBlue));
-    testColorValue(value, makeRGB(0, 0, 255));
+    testColorValue(value, Color(0, 0, 255));
 }
 
 TEST_F(AnimationColorStyleInterpolationTest, Interpolation)
 {
     RefPtr<Interpolation> interpolation = ColorStyleInterpolation::create(
-        *CSSColorValue::create(makeRGBA(0, 0, 0, 255)),
-        *CSSColorValue::create(makeRGBA(255, 255, 255, 255)),
+        *CSSColorValue::create(Color(0, 0, 0, 255)),
+        *CSSColorValue::create(Color(255, 255, 255, 255)),
         CSSPropertyColor
     );
 
     interpolation->interpolate(0, 0.5);
     RefPtrWillBeRawPtr<CSSValue> value = interpolableValueToColor(interpolationValue(*interpolation));
 
-    testColorValue(value, makeRGBA(128, 128, 128, 255));
+    testColorValue(value, Color(128, 128, 128, 255));
 }
 }