third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.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/css/resolver/StyleBuilderCustom.cpp

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

Patch Set: Rebase 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:

Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

index e38b59e5aa9d090ca4c8899bc2656204d53dee02..b7a3a8a2b0420428003561bde76d48fd00de3e4a 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp

@@ -154,9 +154,8 @@ void StyleBuilderFunctions::applyInheritCSSPropertyColor(StyleResolverState& sta

void StyleBuilderFunctions::applyValueCSSPropertyColor(StyleResolverState& state, CSSValue* value)

{

- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);

// As per the spec, 'color: currentColor' is treated as 'color: inherit'

- if (primitiveValue->getValueID() == CSSValueCurrentcolor) {

+ if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueCurrentcolor) {

applyInheritCSSPropertyColor(state);

return;

}