third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp - Issue 1387573003: Pass SkiaImageFilterBuilder& to FilterEffect::createImageFilter

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/platform/graphics/filters/FEDisplacementMap.cpp

Issue 1387573003: Pass SkiaImageFilterBuilder& to FilterEffect::createImageFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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/platform/graphics/filters/FEDisplacementMap.h ('k') | third_party/WebKit/Source/platform/graphics/filters/FEDropShadow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp

index f5f5e46c48337107947e7b753513d9b4209f632a..8c08913699a514b400bd44f66aeacbbe42b21712 100644

--- a/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp

+++ b/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp

@@ -110,13 +110,13 @@ static SkDisplacementMapEffect::ChannelSelectorType toSkiaMode(ChannelSelectorTy

}

-PassRefPtr<SkImageFilter> FEDisplacementMap::createImageFilter(SkiaImageFilterBuilder* builder)

+PassRefPtr<SkImageFilter> FEDisplacementMap::createImageFilter(SkiaImageFilterBuilder& builder)

{

- RefPtr<SkImageFilter> color = builder->build(inputEffect(0), operatingColorSpace());

- RefPtr<SkImageFilter> displ = builder->build(inputEffect(1), operatingColorSpace());

+ RefPtr<SkImageFilter> color = builder.build(inputEffect(0), operatingColorSpace());

+ RefPtr<SkImageFilter> displ = builder.build(inputEffect(1), operatingColorSpace());

SkDisplacementMapEffect::ChannelSelectorType typeX = toSkiaMode(m_xChannelSelector);

SkDisplacementMapEffect::ChannelSelectorType typeY = toSkiaMode(m_yChannelSelector);

- SkImageFilter::CropRect cropRect = getCropRect(builder->cropOffset());

+ SkImageFilter::CropRect cropRect = getCropRect(builder.cropOffset());

// FIXME : Only applyHorizontalScale is used and applyVerticalScale is ignored

// This can be fixed by adding a 2nd scale parameter to SkDisplacementMapEffect

return adoptRef(SkDisplacementMapEffect::Create(typeX, typeY, SkFloatToScalar(filter()->applyHorizontalScale(m_scale)), displ.get(), color.get(), &cropRect));