third_party/WebKit/Source/core/animation/ColorInterpolationType.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/ColorInterpolationType.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/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('k') | third_party/WebKit/Source/core/animation/ColorStyleInterpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 250f02bc53b0ad53d839d87eafd49bbd09b6e273..3dbe6412abcf0cc640fcc855d7836fcd81d146d0 100644

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

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

@@ -75,11 +75,11 @@ PassOwnPtr<InterpolableValue> ColorInterpolationType::createInterpolableColor(co

PassOwnPtr<InterpolableValue> ColorInterpolationType::maybeCreateInterpolableColor(const CSSValue& value)

{

+ if (value.isColorValue())

+ return createInterpolableColor(toCSSColorValue(value).value());

if (!value.isPrimitiveValue())

return nullptr;

const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);

- if (primitive.isRGBColor())

- return createInterpolableColor(primitive.getRGBA32Value());

if (!primitive.isValueID())

return nullptr;

if (!CSSPropertyParser::isColorKeyword(primitive.getValueID()))