third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.cpp - Issue 2575763002: Rename maybeConvertUnderlyingValue() in CSSInterpolationType subclasses

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

Issue 2575763002: Rename maybeConvertUnderlyingValue() in CSSInterpolationType subclasses (Closed)

Patch Set: rebased 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/Source/core/animation/CSSScaleInterpolationType.h ('k') | third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a98f1f6004dbe108f6979f85d90fd3659a25c4de..d7b611c06edf342f176f0c4840fb6ebfa9bdc3fb 100644

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

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

@@ -186,10 +186,11 @@ PairwiseInterpolationValue CSSScaleInterpolationType::maybeMergeSingles(

toCSSScaleNonInterpolableValue(*end.nonInterpolableValue)));

}

-InterpolationValue CSSScaleInterpolationType::maybeConvertUnderlyingValue(

- const InterpolationEnvironment& environment) const {

+InterpolationValue

+CSSScaleInterpolationType::maybeConvertStandardPropertyUnderlyingValue(

+ const StyleResolverState& state) const {

return InterpolationValue(

- Scale(environment.state().style()->scale()).createInterpolableValue());

+ Scale(state.style()->scale()).createInterpolableValue());

}

void CSSScaleInterpolationType::composite(