src/core/SkPaint.cpp - Issue 1852113003: switch maskfilters to sk_sp

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: src/core/SkPaint.cpp

Issue 1852113003: switch maskfilters to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 8 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:

Index: src/core/SkPaint.cpp

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp

index d5e4c08c1f513f8fce143e1a50708c2400cb4c30..8bd386a762a201d4e9adb4121a272e220ddbcc45 100644

--- a/src/core/SkPaint.cpp

+++ b/src/core/SkPaint.cpp

@@ -386,7 +386,9 @@ SET_PTR(Xfermode)

#ifdef SK_SUPPORT_LEGACY_PATHEFFECT_PTR

SET_PTR(PathEffect)

#endif

+#ifdef SK_SUPPORT_LEGACY_MASKFILTER_PTR

SET_PTR(MaskFilter)

+#endif

#undef SET_PTR

#ifdef SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR

@@ -2255,7 +2257,7 @@ SkTextBaseIter::SkTextBaseIter(const char text[], size_t length,

}

fPaint.setStyle(style);

fPaint.setPathEffect(pe);

- fPaint.setMaskFilter(paint.getMaskFilter()); // restore

+ fPaint.setMaskFilter(sk_ref_sp(paint.getMaskFilter())); // restore

// now compute fXOffset if needed

« no previous file with comments | « src/c/sk_surface.cpp ('k') | src/effects/SkBlurDrawLooper.cpp » ('j') | no next file with comments »