dm/DM.cpp - Issue 1974783002: Revert of 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: dm/DM.cpp

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

Patch Set: 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: dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp

index 59fff691b0a0acf5b370459b923f3f89009d25f1..e10ccea5ce0a9a7da9bd85d94214cdca039bdc6a 100644

--- a/dm/DM.cpp

+++ b/dm/DM.cpp

@@ -1286,7 +1286,7 @@

#define PORTABLE_FONT_PREFIX "Toy Liberation "

-static sk_sp<SkTypeface> create_from_name(const char familyName[], SkTypeface::Style style) {

+static SkTypeface* create_from_name(const char familyName[], SkTypeface::Style style) {

if (familyName && strlen(familyName) > sizeof(PORTABLE_FONT_PREFIX)

&& !strncmp(familyName, PORTABLE_FONT_PREFIX, sizeof(PORTABLE_FONT_PREFIX) - 1)) {

return sk_tool_utils::create_portable_typeface(familyName, style);

@@ -1296,7 +1296,7 @@

#undef PORTABLE_FONT_PREFIX

-extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style );

+extern SkTypeface* (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style );

int dm_main();

int dm_main() {