third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp - Issue 2743363006: Clean up cc/paint interfaces

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

Issue 2743363006: Clean up cc/paint interfaces (Closed)

Patch Set: Fix PaintControllerTest v2 Created 3 years, 9 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/compositing/PaintChunksToCcLayer.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/DisplayItemList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4fba11956b6fb9c119e2a721018eeb66f5b951a0..f58de158e1afff43ff4befa1030aaa2a5af29368 100644

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

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

@@ -116,7 +116,7 @@ static float kMaxMaskBufferSize =

sk_sp<SkImageFilter> buildBoxReflectFilter(const BoxReflection& reflection,

sk_sp<SkImageFilter> input) {

sk_sp<SkImageFilter> maskedInput;

- if (PaintRecord* maskRecord = reflection.mask()) {

+ if (sk_sp<PaintRecord> maskRecord = reflection.mask()) {

// Since PaintRecords can't be serialized to the browser process, first

// raster the mask to a bitmap, then encode it in an SkImageSource, which

// can be serialized.

@@ -148,7 +148,7 @@ sk_sp<SkImageFilter> buildBoxReflectFilter(const BoxReflection& reflection,

SkImageFilter::CropRect cropRect(maskRecord->cullRect());

maskedInput = SkXfermodeImageFilter::Make(

SkBlendMode::kSrcOver,

- SkPictureImageFilter::Make(sk_ref_sp(ToSkPicture(maskRecord))), input,

+ SkPictureImageFilter::Make(ToSkPicture(std::move(maskRecord))), input,

&cropRect);

}

} else {