From ee6a9919a362e16c1d84a870ce867d1ad7b8a141 Mon Sep 17 00:00:00 2001 From: mboc Date: Tue, 31 May 2016 11:42:36 -0700 Subject: 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 --- gm/fontcache.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gm/fontcache.cpp') diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index c4af489304..22b29f47ab 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -32,8 +32,10 @@ protected: } void onOnceBeforeDraw() override { - fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kItalic); - fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kItalic); + fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif", + SkFontStyle::FromOldStyle(SkTypeface::kItalic)); + fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif", + SkFontStyle::FromOldStyle(SkTypeface::kItalic)); } void onDraw(SkCanvas* canvas) override { -- cgit v1.2.3