include/core/SkShader.h - Issue 1832223002: switch xfermodes over 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: include/core/SkShader.h

Issue 1832223002: switch xfermodes over to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebase 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:

Index: include/core/SkShader.h

diff --git a/include/core/SkShader.h b/include/core/SkShader.h

index e2ebda5f1018218806cd49f56d1c644e2c3101d2..0de53ad65240a839e7889a838cdca2c02561e561 100644

--- a/include/core/SkShader.h

+++ b/include/core/SkShader.h

@@ -404,7 +404,11 @@ public:

* The caller is responsible for managing its reference-count for the xfer (if not null).

static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,

+ sk_sp<SkXfermode> xfer);

+#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR

+ static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,

SkXfermode* xfer);

+#endif

/** Call this to create a new shader that will draw with the specified bitmap.