third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp - Issue 1885353004: Add ComputedStyle constructor and getter to InterpolationEnvironment

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

Issue 1885353004: Add ComputedStyle constructor and getter to InterpolationEnvironment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_transformInterpolationType

Patch Set: Rebased Created 4 years, 4 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/CSSImageSliceInterpolationType.cpp ('k') | third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 89fb940e39fec7252930e4cf59d79133e8d4dcad..fbef4bb8980de364f8c6bc60cde5b37287ea4ed2 100644

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

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

@@ -32,7 +32,7 @@ private:

bool isValid(const InterpolationEnvironment& environment, const InterpolationValue& underlying) const final

{

// TODO(alancutter): Just check the variables referenced instead of doing a full CSSValue resolve.

- const CSSValue* resolvedValue = CSSVariableResolver::resolveVariableReferences(environment.state().style()->variables(), m_property, *m_variableReference);

+ const CSSValue* resolvedValue = CSSVariableResolver::resolveVariableReferences(environment.style().variables(), m_property, *m_variableReference);

return m_resolvedValue->equals(*resolvedValue);

}

@@ -54,7 +54,7 @@ InterpolationValue CSSInterpolationType::maybeConvertSingle(const PropertySpecif

return nullptr;

if (value->isVariableReferenceValue() && !isShorthandProperty(cssProperty())) {

- resolvedCSSValueOwner = CSSVariableResolver::resolveVariableReferences(environment.state().style()->variables(), cssProperty(), toCSSVariableReferenceValue(*value));

+ resolvedCSSValueOwner = CSSVariableResolver::resolveVariableReferences(environment.style().variables(), cssProperty(), toCSSVariableReferenceValue(*value));

conversionCheckers.append(ResolvedVariableChecker::create(cssProperty(), toCSSVariableReferenceValue(value), resolvedCSSValueOwner));

value = resolvedCSSValueOwner;

}