third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp - Issue 1399853005: Changed CSSColorValue to return a Color

Unified Diff: third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp

Issue 1399853005: Changed CSSColorValue to return a Color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_color

Patch Set: Fix for ManifestParser Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/animation/ColorStyleInterpolationTest.cpp ('k') | third_party/WebKit/Source/core/css/CSSColorValue.h » ('j') | third_party/WebKit/Source/web/WebCSSParser.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp

diff --git a/third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp b/third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp

index 9386d23b90a1041148de175014c9643801d26099..df2a09948ae835382af07f2999a02ae94a1095d9 100644

--- a/third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp

+++ b/third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp

@@ -36,7 +36,7 @@ protected:

}

static void testPrimitiveValues(RefPtrWillBeRawPtr<CSSValue> value, double xExpected, double yExpected, double blurExpected, double spreadExpected,

- RGBA32 colorExpected, RefPtrWillBeRawPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)

+ Color colorExpected, RefPtrWillBeRawPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)

{

EXPECT_TRUE(value->isShadowValue());

@@ -60,7 +60,7 @@ protected:

TEST_F(AnimationShadowStyleInterpolationTest, ZeroTest)

{

- RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(makeRGBA(0, 0, 0, 0));

+ RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(Color(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);

@@ -70,12 +70,12 @@ TEST_F(AnimationShadowStyleInterpolationTest, ZeroTest)

RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false);

- testPrimitiveValues(value, 0, 0, 0, 0, makeRGBA(0, 0, 0, 0), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Pixels);

+ testPrimitiveValues(value, 0, 0, 0, 0, Color(0, 0, 0, 0), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Pixels);

}

TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)

{

- RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(makeRGBA(112, 123, 175, 255));

+ RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(Color(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);

@@ -85,12 +85,12 @@ TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)

RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false);

- testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(112, 123, 175, 255), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Ems);

+ testPrimitiveValues(value, 10, 20, 30, 40, Color(112, 123, 175, 255), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Ems);

}

TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)

{

- RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(makeRGBA(54, 48, 214, 64));

+ RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(Color(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);

@@ -100,7 +100,7 @@ TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)

RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), true);

- testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(54, 48, 214, 64), CSSPrimitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::UnitType::Pixels);

+ testPrimitiveValues(value, 10, 20, 30, 40, Color(54, 48, 214, 64), CSSPrimitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::UnitType::Pixels);

}