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/verttext2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gm/verttext2.cpp') diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp index 79cbdbcc8b..9afedc6078 100644 --- a/gm/verttext2.cpp +++ b/gm/verttext2.cpp @@ -24,9 +24,9 @@ protected: const int pointSize = 24; textHeight = SkIntToScalar(pointSize); fProp = SkTypeface::MakeFromName(sk_tool_utils::platform_font_name("sans-serif"), - SkTypeface::kNormal); + SkFontStyle()); fMono = SkTypeface::MakeFromName(sk_tool_utils::platform_font_name("monospace"), - SkTypeface::kNormal); + SkFontStyle()); } SkString onShortName() override { -- cgit v1.2.3