diff options
| author |  scroggo <scroggo@google.com> | 2016-05-12 06:22:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 06:22:30 -0700 |
| commit | 9a9a7b29e5e5916a7b6453cd124ca437f14b9da4 (patch) | |
| tree | ad5b560f6ed5da12040e5665282fd2227c305ff8 /tools/sk_tool_utils.cpp | |
| parent | a1b283345b27fef91908b104a30cb89e6fbdaade (diff) | |
Revert of Move SkTypeface to sk_sp. (patchset #5 id:80001 of https://codereview.chromium.org/1933393002/ )
Reason for revert:
fontmgr_iterAndroid failing to draw emoji. E.g. 6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm">https://gold.skia.org/search2?blame=6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm
Original issue's description:
> Move SkTypeface to sk_sp.
>
> Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
TBR=reed@google.com,fmalita@chromium.org,tomhudson@google.com,bungeman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1974783002
Diffstat (limited to 'tools/sk_tool_utils.cpp')
| -rw-r--r-- | tools/sk_tool_utils.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index 7343ce4744..f46ebb6e60 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,14 +75,17 @@ const char* platform_os_emoji() { return ""; } -sk_sp<SkTypeface> emoji_typeface() { +void emoji_typeface(SkAutoTUnref<SkTypeface>* tf) { if (!strcmp(sk_tool_utils::platform_os_emoji(), "CBDT")) { - return MakeResourceAsTypeface("/fonts/Funkster.ttf"); + tf->reset(GetResourceAsTypeface("/fonts/Funkster.ttf")); + return; } if (!strcmp(sk_tool_utils::platform_os_emoji(), "SBIX")) { - return SkTypeface::MakeFromName("Apple Color Emoji", SkTypeface::kNormal); + tf->reset(SkTypeface::CreateFromName("Apple Color Emoji", SkTypeface::kNormal)); + return; } - return nullptr; + tf->reset(nullptr); + return; } const char* emoji_sample_text() { @@ -156,12 +159,13 @@ SkColor color_to_565(SkColor color) { return SkPixel16ToColor(color16); } -sk_sp<SkTypeface> create_portable_typeface(const char* name, SkTypeface::Style style) { +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) { - paint->setTypeface(create_font(name, style)); + SkTypeface* face = create_font(name, style); + SkSafeUnref(paint->setTypeface(face)); } void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y, |