third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp - Issue 2537373005: [css-ui] Make caret-color animatable

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/CSSColorInterpolationType.cpp

Issue 2537373005: [css-ui] Make caret-color animatable (Closed)

Patch Set: Apply suggested changes and add new composition test Created 4 years 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/LayoutTests/animations/interpolation/caret-color-interpolation.html ('k') | third_party/WebKit/Source/core/animation/CSSInterpolationTypesMap.cpp » ('j') | third_party/WebKit/Source/core/animation/ColorPropertyFunctions.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 93f1624dc4358cfca72214bac760bd8926ae8fde..67f0b8e72d31bba5b796ac6efdd8b8985b4c03fd 100644

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

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

@@ -184,9 +184,10 @@ InterpolationValue CSSColorInterpolationType::maybeConvertNeutral(

InterpolationValue CSSColorInterpolationType::maybeConvertInitial(

const StyleResolverState&,

ConversionCheckers& conversionCheckers) const {

- const StyleColor initialColor =

- ColorPropertyFunctions::getInitialColor(cssProperty());

- return convertStyleColorPair(initialColor, initialColor);

+ StyleColor initialColor;

+ if (ColorPropertyFunctions::getInitialColor(cssProperty(), initialColor))

+ return convertStyleColorPair(initialColor, initialColor);

+ return nullptr;

}

InterpolationValue CSSColorInterpolationType::maybeConvertInherit(