third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp - Issue 1849213002: Remove SK_SUPPORT_LEGACY_XFERMODE_PTR

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/modules/canvas2d/BaseRenderingContext2D.cpp

Issue 1849213002: Remove SK_SUPPORT_LEGACY_XFERMODE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adopt the pointer but don't ref it Created 4 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

« cc/output/software_renderer.cc ('K') | « skia/ext/benchmarking_canvas.cc ('k') | third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.cpp » ('j') | third_party/WebKit/Source/platform/graphics/filters/FEBlend.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

index 1dfaa25bf7ae625158fea3a90e31921628c280a9..bfb54ad5f708e97b3a7d4af5634790c4ff10bce9 100644

--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

@@ -922,8 +922,8 @@ void BaseRenderingContext2D::drawImageInternal(SkCanvas* c, CanvasImageSource* i

}

SkRect bounds = dstRect;

SkPaint layerPaint;

- layerPaint.setXfermode(paint->getXfermode());

- SkAutoTUnref<SkImageFilter> localFilter(paint->getImageFilter()->newWithLocalMatrix(invCtm));

+ layerPaint.setXfermode(sk_ref_sp(paint->getXfermode()));

+ sk_sp<SkImageFilter> localFilter(paint->getImageFilter()->makeWithLocalMatrix(invCtm));

layerPaint.setImageFilter(localFilter);

f(malita) 2016/04/01 18:16:00 std::move or inline.

c->saveLayer(&bounds, &layerPaint);

imagePaint.setXfermodeMode(SkXfermode::kSrcOver_Mode);