diff options
author | 2016-05-31 11:42:36 -0700 | |
---|---|---|
committer | 2016-05-31 11:42:37 -0700 | |
commit | ee6a9919a362e16c1d84a870ce867d1ad7b8a141 (patch) | |
tree | 971189523fe82821c82a936cafaefd59b76338f7 /tools/sk_tool_utils.cpp | |
parent | bfa9275968d11d459b30a485cedcb55c7fecf9d7 (diff) |
SkTypeface::MakeFromName to take SkFontStyle.
SkTypeface::MakeFromName currently takes SkTypeface::Style,
which is quite limited. This starts the transition to this
function taking SkFontStyle instead.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1818043002
TBR=reed
He said it sounded like a good idea.
Review-Url: https://codereview.chromium.org/1818043002
Diffstat (limited to 'tools/sk_tool_utils.cpp')
-rw-r--r-- | tools/sk_tool_utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index 7343ce4744..9278c84807 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -80,7 +80,7 @@ sk_sp<SkTypeface> emoji_typeface() { return MakeResourceAsTypeface("/fonts/Funkster.ttf"); } if (!strcmp(sk_tool_utils::platform_os_emoji(), "SBIX")) { - return SkTypeface::MakeFromName("Apple Color Emoji", SkTypeface::kNormal); + return SkTypeface::MakeFromName("Apple Color Emoji", SkFontStyle()); } return nullptr; } @@ -156,11 +156,11 @@ SkColor color_to_565(SkColor color) { return SkPixel16ToColor(color16); } -sk_sp<SkTypeface> create_portable_typeface(const char* name, SkTypeface::Style style) { +sk_sp<SkTypeface> create_portable_typeface(const char* name, SkFontStyle style) { return create_font(name, style); } -void set_portable_typeface(SkPaint* paint, const char* name, SkTypeface::Style style) { +void set_portable_typeface(SkPaint* paint, const char* name, SkFontStyle style) { paint->setTypeface(create_font(name, style)); } |