third_party/WebKit/Source/core/animation/CSSImageInterpolationType.cpp - Issue 1428513003: Pass InterpolationEnvironment as a reference to InterpolationType conversion functions

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

Issue 1428513003: Pass InterpolationEnvironment as a reference to InterpolationType conversion functions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_svgAttributeReference

Patch Set: Created 5 years, 2 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/CSSImageInterpolationType.h ('k') | third_party/WebKit/Source/core/animation/CSSImageListInterpolationType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 25dda4ab6a5711170318d0dbf8573dea9567aae9..f8df2b8fcf4b3fa1c34cdd163a9e5545091169b2 100644

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

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

@@ -184,19 +184,19 @@ private:

RefPtrWillBePersistent<StyleImage> m_inheritedImage;

};

-PassOwnPtr<InterpolationValue> CSSImageInterpolationType::maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const

+PassOwnPtr<InterpolationValue> CSSImageInterpolationType::maybeConvertInherit(const StyleResolverState& state, ConversionCheckers& conversionCheckers) const

{

- if (!state || !state->parentStyle())

+ if (!state.parentStyle())

return nullptr;

- const StyleImage* inheritedImage = ImagePropertyFunctions::getStyleImage(cssProperty(), *state->parentStyle());

+ const StyleImage* inheritedImage = ImagePropertyFunctions::getStyleImage(cssProperty(), *state.parentStyle());

StyleImage* refableImage = const_cast<StyleImage*>(inheritedImage);

conversionCheckers.append(ParentImageChecker::create(*this, cssProperty(), refableImage));

InterpolationComponent component = maybeConvertStyleImage(inheritedImage, true);

return component ? InterpolationValue::create(*this, component) : nullptr;

}

-PassOwnPtr<InterpolationValue> CSSImageInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers&) const

+PassOwnPtr<InterpolationValue> CSSImageInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState&, ConversionCheckers&) const

{

InterpolationComponent component = maybeConvertCSSValue(value, true);

return component ? InterpolationValue::create(*this, component) : nullptr;