SkTypeface::MakeFromName to take SkFontStyle.

include/core/SkTypeface.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTypeface_DEFINED
 #define SkTypeface_DEFINED
 
@@ skipping 11 matching lines @@
 struct SkScalerContextEffects;
 class SkStream;
 class SkStreamAsset;
 class SkAdvancedTypefaceMetrics;
 class SkWStream;
 
 typedef uint32_t SkFontID;
 /** Machine endian. */
 typedef uint32_t SkFontTableTag;
 
+#ifdef SK_INTERNAL
+#ifndef SK_DONT_USE_LEGACY_TYPEFACE_MAKE_FROM_NAME
+#define SK_DONT_USE_LEGACY_TYPEFACE_MAKE_FROM_NAME
+#endif
+#endif
+
 /** \class SkTypeface
 
     The SkTypeface class specifies the typeface and intrinsic style of a font.
     This is used in the paint, along with optionally algorithmic settings like
     textSize, textSkewX, textScaleX, kFakeBoldText_Mask, to specify
     how text appears when drawn (and measured).
 
     Typeface objects are immutable, and so they can be shared between threads.
 */
 class SK_API SkTypeface : public SkWeakRefCnt {
@@ skipping 51 matching lines @@
     static bool Equal(const SkTypeface* facea, const SkTypeface* faceb);
 
     /** Returns the default typeface, which is never nullptr. */
     static sk_sp<SkTypeface> MakeDefault(Style style = SkTypeface::kNormal);
 #ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
     static SkTypeface* RefDefault(Style style = SkTypeface::kNormal) {
         return MakeDefault(style).release();
     }
 #endif
 
+  /** Creates a new reference to the typeface that most closely matches the
+      requested familyName and fontStyle. This method allows extended font
+      face specifiers as in the SkFontStyle type. Will never return null.
+
+      @param familyName  May be NULL. The name of the font family.
+      @param fontStyle   The style of the typeface.
+      @return reference to the closest-matching typeface. Call must call
+              unref() when they are done.
+    */
+  static sk_sp<SkTypeface> MakeFromName(const char familyName[],
+                                        SkFontStyle fontStyle);
+
+#ifndef SK_DONT_USE_LEGACY_TYPEFACE_MAKE_FROM_NAME
     /** Return the typeface that most closely matches the requested familyName and style.
         Pass nullptr as the familyName to request the default font for the requested style.
         Will never return nullptr.
 
         @param familyName  May be NULL. The name of the font family.
         @param style       The style (normal, bold, italic) of the typeface.
         @return the closest-matching typeface.
     */
     static sk_sp<SkTypeface> MakeFromName(const char familyName[], Style style);
+#endif
 #ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
     static SkTypeface* CreateFromName(const char familyName[], Style style) {
-        return MakeFromName(familyName, style).release();
+        return MakeFromName(familyName, SkFontStyle::FromOldStyle(style)).release();
     }
 #endif
 
     /** Return the typeface that most closely matches the requested typeface and style.
         Use this to pick a new style from the same family of the existing typeface.
         If family is nullptr, this selects from the default font's family.
 
         @param family  May be NULL. The name of the existing type face.
         @param s       The style (normal, bold, italic) of the type face.
         @return the closest-matching typeface.
@@ skipping 304 matching lines @@
     mutable SkOnce      fBoundsOnce;
     bool                fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif