diff options
| author |  bungeman <bungeman@google.com> | 2016-05-12 10:09:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 10:09:31 -0700 |
| commit | 13b9c95295f4c5732e34574789e721a6bc08f7b4 (patch) | |
| tree | c3ef0aa2af9890c03cb79968f32166af39fba9ba /dm | |
| parent | 40d21de8b6620d724f34bdc85af1dcb593d33fe0 (diff) | |
Move SkTypeface to sk_sp.
Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933393002
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() { |