diff options
author | 2016-05-11 12:38:18 -0700 | |
---|---|---|
committer | 2016-05-11 12:38:18 -0700 | |
commit | 6296da736fbf40aae881650c239420f64e576c3f (patch) | |
tree | 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89 /dm | |
parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DM.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1286,7 +1286,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); @@ -1296,7 +1296,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() { |