third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp - Issue 2340893003: Support interpolation of animatable shorthand properties containing var()

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 2340893003: Support interpolation of animatable shorthand properties containing var() (Closed)

Patch Set: Update DCHECK Created 4 years, 3 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 f7dad119e1c2ff37ae61a23783aa2afd0e4bc014..a9faee2eeb16c8d9afe3a28c8dd038dd3ce8ab86 100644

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

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

@@ -112,9 +112,7 @@ void StyleBuilder::applyProperty(CSSPropertyID id, StyleResolverState& state, co

if (id != CSSPropertyVariable

&& (value.isVariableReferenceValue() || value.isPendingSubstitutionValue())) {

- const CSSValue* resolvedValue = value.isVariableReferenceValue() ?

- CSSVariableResolver::resolveVariableReferences(state, id, toCSSVariableReferenceValue(value)) :

- CSSVariableResolver::resolvePendingSubstitutions(state, id, toCSSPendingSubstitutionValue(value));

+ const CSSValue* resolvedValue = CSSVariableResolver::resolveVariableReferences(state, id, value);

applyProperty(id, state, *resolvedValue);

if (!state.style()->hasVariableReferenceFromNonInheritedProperty() && !CSSPropertyMetadata::isInheritedProperty(id))