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 --- tools/sk_tool_utils.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/sk_tool_utils.h') diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h index a16c2a2f6e..c4d7c8a265 100644 --- a/tools/sk_tool_utils.h +++ b/tools/sk_tool_utils.h @@ -72,12 +72,12 @@ namespace sk_tool_utils { * Sets the paint to use a platform-independent text renderer */ void set_portable_typeface(SkPaint* paint, const char* name = nullptr, - SkTypeface::Style style = SkTypeface::kNormal); + SkFontStyle style = SkFontStyle()); /** * Returns a platform-independent text renderer. */ - sk_sp create_portable_typeface(const char* name, SkTypeface::Style style); + sk_sp create_portable_typeface(const char* name, SkFontStyle style); /** Call to clean up portable font references. */ void release_portable_typefaces(); @@ -89,7 +89,7 @@ namespace sk_tool_utils { void write_pixels(SkCanvas*, const SkBitmap&, int x, int y, SkColorType, SkAlphaType); // private to sk_tool_utils - sk_sp create_font(const char* name, SkTypeface::Style); + sk_sp create_font(const char* name, SkFontStyle); /** Returns a newly created CheckerboardShader. */ sk_sp create_checkerboard_shader(SkColor c1, SkColor c2, int size); -- cgit v1.2.3