third_party/WebKit/Source/core/animation/ShadowStyleInterpolation.cpp - Issue 1376573004: Split out Color from CSSPrimitiveValue

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1376573004: Split out Color from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_property

Patch Set: Rebase and review feedback 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/ListStyleInterpolationTest.cpp ('k') | third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c6b2646915c215f7835268782778eadf5ad9a74b..70d012e25cc0e24d328e9df1651f9314ccea4070 100644

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

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

@@ -7,6 +7,7 @@

#include "core/animation/ColorStyleInterpolation.h"

#include "core/animation/LengthStyleInterpolation.h"

+#include "core/css/CSSColorValue.h"

#include "core/css/CSSPrimitiveValue.h"

#include "core/css/CSSValueList.h"

#include "core/css/CSSValuePool.h"

@@ -62,7 +63,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ShadowStyleInterpolation::fromInterpolableValue

RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = LengthStyleInterpolation::fromInterpolableValue(*shadow->get(2), RangeNonNegative);

RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = LengthStyleInterpolation::fromInterpolableValue(*shadow->get(3), RangeAll);

- RefPtrWillBeRawPtr<CSSPrimitiveValue> color = ColorStyleInterpolation::interpolableValueToColor(*shadow->get(4));

+ RefPtrWillBeRawPtr<CSSColorValue> color = ColorStyleInterpolation::interpolableValueToColor(*shadow->get(4));

RefPtrWillBeRawPtr<CSSPrimitiveValue> style = nonInterpolableData ? CSSPrimitiveValue::createIdentifier(CSSValueInset) : CSSPrimitiveValue::createIdentifier(CSSValueNone);

RefPtrWillBeRawPtr<CSSShadowValue> result = CSSShadowValue::create(x, y, blur, spread, style, color);