include/core/SkPaint.h - Issue 1933393002: Move SkTypeface 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/SkPaint.h

Issue 1933393002: Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Restore deleted Android code. Created 4 years, 7 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/SkPaint.h

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

index 7367fc642deb7bf3a5b4d4c315ba9fc635188830..293ffedc12aee6efac85be0ab93d685e73b859c5 100644

--- a/include/core/SkPaint.h

+++ b/include/core/SkPaint.h

@@ -614,8 +614,10 @@ public:

paint

@return typeface

- SkTypeface* setTypeface(SkTypeface* typeface);

void setTypeface(sk_sp<SkTypeface>);

+#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR

+ SkTypeface* setTypeface(SkTypeface* typeface);

+#endif

/** Get the paint's rasterizer (or NULL).

<p />

« no previous file with comments | « include/core/SkFont.h ('k') | include/core/SkTypeface.h » ('j') | no next file with comments »