third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.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/DeferredLegacyStyleInterpolation.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/ColorStyleInterpolationTest.cpp ('k') | third_party/WebKit/Source/core/animation/ListStyleInterpolationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 28cb9f3643c4da35344fa666d2cc811a0cc425f9..10bca36fe29973a133d61bae7f9849bae41fe811 100644

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

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

@@ -56,6 +56,8 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C

return interpolationRequiresStyleResolve(toCSSBasicShapePolygonValue(value));

if (value.isBasicShapeInsetValue())

return interpolationRequiresStyleResolve(toCSSBasicShapeInsetValue(value));

+ if (value.isColorValue())

+ return false;

if (value.isStringValue() || value.isURIValue() || value.isCustomIdentValue())

return false;

if (value.isPrimitiveValue())

@@ -79,7 +81,7 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C

bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSPrimitiveValue& primitiveValue)

{

// FIXME: consider other types.

- if (primitiveValue.isNumber() || primitiveValue.isPercentage() || primitiveValue.isAngle() || primitiveValue.isRGBColor())

+ if (primitiveValue.isNumber() || primitiveValue.isPercentage() || primitiveValue.isAngle())

return false;

if (primitiveValue.isLength())