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 /tools/sk_tool_utils.cpp | |
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 'tools/sk_tool_utils.cpp')
-rw-r--r-- | tools/sk_tool_utils.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index f46ebb6e60..7343ce4744 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright 2014 Google Inc. * * Use of this source code is governed by a BSD-style license that can be @@ -75,17 +75,14 @@ const char* platform_os_emoji() { return ""; } -void emoji_typeface(SkAutoTUnref<SkTypeface>* tf) { +sk_sp<SkTypeface> emoji_typeface() { if (!strcmp(sk_tool_utils::platform_os_emoji(), "CBDT")) { - tf->reset(GetResourceAsTypeface("/fonts/Funkster.ttf")); - return; + return MakeResourceAsTypeface("/fonts/Funkster.ttf"); } if (!strcmp(sk_tool_utils::platform_os_emoji(), "SBIX")) { - tf->reset(SkTypeface::CreateFromName("Apple Color Emoji", SkTypeface::kNormal)); - return; + return SkTypeface::MakeFromName("Apple Color Emoji", SkTypeface::kNormal); } - tf->reset(nullptr); - return; + return nullptr; } const char* emoji_sample_text() { @@ -159,13 +156,12 @@ SkColor color_to_565(SkColor color) { return SkPixel16ToColor(color16); } -SkTypeface* create_portable_typeface(const char* name, SkTypeface::Style style) { +sk_sp<SkTypeface> create_portable_typeface(const char* name, SkTypeface::Style style) { return create_font(name, style); } void set_portable_typeface(SkPaint* paint, const char* name, SkTypeface::Style style) { - SkTypeface* face = create_font(name, style); - SkSafeUnref(paint->setTypeface(face)); + paint->setTypeface(create_font(name, style)); } void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y, |