Source/core/animation/ShadowStyleInterpolationTest.cpp - Issue 851633002: Animation: Add template for ListStyleInterpolation

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

Issue 851633002: Animation: Add template for ListStyleInterpolation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Create new methods in ShadowStyleInterpolation Created 5 years, 11 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

« Source/core/animation/ListStyleInterpolation.h ('K') | « Source/core/animation/ShadowStyleInterpolation.cpp ('k') | Source/core/animation/StringKeyframe.cpp » ('j') | Source/core/animation/StringKeyframe.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/ShadowStyleInterpolationTest.cpp

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

index ad40cd8afad87f57a0ded25fdf123073e77b66ed..d4f7b850ac307cae5f7dba2bddaa1f71b1f20d8a 100644

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

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

@@ -19,9 +19,19 @@ class AnimationShadowStyleInterpolationTest : public ::testing::Test {

protected:

+ static PassOwnPtrWillBeRawPtr<InterpolableValue> shadowToInterpolableValue(const CSSValue& value, bool styleFlag)

+ {

+ return ShadowStyleInterpolation::shadowToInterpolableValue(value, styleFlag);

+ }

+ static PassRefPtrWillBeRawPtr<CSSValue> interpolableValueToShadow(InterpolableValue* value, bool styleFlag)

+ {

+ return ShadowStyleInterpolation::interpolableValueToShadow(*value, styleFlag);

+ }

static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value, bool styleFlag)

{

- return ShadowStyleInterpolation::interpolableValueToShadow(ShadowStyleInterpolation::shadowToInterpolableValue(*value).get(), styleFlag);

+ return interpolableValueToShadow(shadowToInterpolableValue(*value, styleFlag).get(), styleFlag);

}

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

@@ -64,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);

+ RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));

+ RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_EMS);

+ RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_EMS);

+ RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_EMS);

+ RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_EMS);

RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);

@@ -79,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);

+ RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(54, 48, 214, 64));

+ RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);

+ RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);

+ RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PX);

+ RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_PX);

RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);