| Index: dm/DM.cpp
|
| diff --git a/dm/DM.cpp b/dm/DM.cpp
|
| index 9dbd43adda05367aa7ec1fccbda964de73593d59..7f76c43eb2ad19814261c7e6a21c69342ae320d7 100644
|
| --- a/dm/DM.cpp
|
| +++ b/dm/DM.cpp
|
| @@ -1281,7 +1281,7 @@ SkThread* start_status_thread() {
|
|
|
| #define PORTABLE_FONT_PREFIX "Toy Liberation "
|
|
|
| -static SkTypeface* create_from_name(const char familyName[], SkTypeface::Style style) {
|
| +static sk_sp<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);
|
| @@ -1291,7 +1291,7 @@ static SkTypeface* create_from_name(const char familyName[], SkTypeface::Style s
|
|
|
| #undef PORTABLE_FONT_PREFIX
|
|
|
| -extern SkTypeface* (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style );
|
| +extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style );
|
|
|
| int dm_main();
|
| int dm_main() {
|
|
|