third_party/WebKit/Source/core/animation/CSSImageSliceInterpolationType.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/CSSImageSliceInterpolationType.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/CSSImageListInterpolationType.cpp ('k') | third_party/WebKit/Source/core/animation/CSSInterpolationType.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1a6aff641e8f9a5ee739154b5fbb367b333e9d1f..31084826b48b0edab86770f4cd64dc4acf23ea53 100644

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

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

@@ -196,7 +196,7 @@ InterpolationValue CSSImageSliceInterpolationType::maybeConvertValue(const CSSVa

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

{

- const ComputedStyle& style = *environment.state().style();

+ const ComputedStyle& style = environment.style();

return convertImageSlice(ImageSlicePropertyFunctions::getImageSlice(cssProperty(), style), style.effectiveZoom());

}

@@ -224,7 +224,7 @@ void CSSImageSliceInterpolationType::composite(UnderlyingValueOwner& underlyingV

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

{

- ComputedStyle& style = *environment.state().style();

+ ComputedStyle& style = environment.style();

const InterpolableList& list = toInterpolableList(interpolableValue);

const SliceTypes& types = toCSSImageSliceNonInterpolableValue(nonInterpolableValue)->types();

const auto& convertSide = [&types, &list, &style](size_t index)