third_party/WebKit/Source/core/animation/CSSScaleInterpolationType.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/CSSScaleInterpolationType.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/CSSRotateInterpolationType.cpp ('k') | third_party/WebKit/Source/core/animation/CSSShadowListInterpolationType.cpp » ('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 8ff23f43e93edcb4384d077805b7db0a9e7dd758..b8625f90ae4879ea8641f958a5d815e2eba20bd9 100644

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

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

@@ -180,7 +180,8 @@ PairwiseInterpolationValue CSSScaleInterpolationType::maybeMergeSingles(Interpol

InterpolationValue CSSScaleInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const

{

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

+ Scale scale = Scale(environment.style().scale());

+ return InterpolationValue(scale.createInterpolableValue(), CSSScaleNonInterpolableValue::create(scale, false));

}

void CSSScaleInterpolationType::composite(UnderlyingValueOwner& underlyingValueOwner, double underlyingFraction, const InterpolationValue& value, double interpolationFraction) const

@@ -200,7 +201,7 @@ void CSSScaleInterpolationType::composite(UnderlyingValueOwner& underlyingValueO

void CSSScaleInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue*, InterpolationEnvironment& environment) const

{

Scale scale(interpolableValue);

- environment.state().style()->setScale(ScaleTransformOperation::create(scale.array[0], scale.array[1], scale.array[2], TransformOperation::Scale3D));

+ environment.style().setScale(ScaleTransformOperation::create(scale.array[0], scale.array[1], scale.array[2], TransformOperation::Scale3D));

}

} // namespace blink