SkTypeface::MakeFromName to take SkFontStyle.

tools/sk_tool_utils.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef sk_tool_utils_DEFINED
 #define sk_tool_utils_DEFINED
 
@@ skipping 54 matching lines @@
 
     /**
      * Map serif, san-serif, and monospace to the platform-specific font name.
      */
     const char* platform_font_name(const char* name);
 
     /**
      * 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<SkTypeface> create_portable_typeface(const char* name, SkTypeface::Style style);
+    sk_sp<SkTypeface> create_portable_typeface(const char* name, SkFontStyle style);
 
     /** Call to clean up portable font references. */
     void release_portable_typefaces();
 
     /**
      *  Call canvas->writePixels() by using the pixels from bitmap, but with an info that claims
      *  the pixels are colorType + alphaType
      */
     void write_pixels(SkCanvas*, const SkBitmap&, int x, int y, SkColorType, SkAlphaType);
 
     // private to sk_tool_utils
-    sk_sp<SkTypeface> create_font(const char* name, SkTypeface::Style);
+    sk_sp<SkTypeface> create_font(const char* name, SkFontStyle);
 
     /** Returns a newly created CheckerboardShader. */
     sk_sp<SkShader> create_checkerboard_shader(SkColor c1, SkColor c2, int size);
 
     /** Draw a checkerboard pattern in the current canvas, restricted to
         the current clip, using SkXfermode::kSrc_Mode. */
     void draw_checkerboard(SkCanvas* canvas,
                            SkColor color1,
                            SkColor color2,
                            int checkSize);
@@ skipping 113 matching lines @@
         int  fID;
         int  fOutputPos;
         bool fTempMark;
 
         SkTDArray<TopoTestNode*> fDependencies;
     };
 
 }  // namespace sk_tool_utils
 
 #endif  // sk_tool_utils_DEFINED