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
@@ skipping 81 matching lines @@
         handling either being null (treating null as the default font)
      */
     static bool Equal(const SkTypeface* facea, const SkTypeface* faceb);
 
     /**
      *  Returns a ref() to the default typeface. The caller must call unref()
      *  when they are done referencing the object. Never returns NULL.
      */
     static SkTypeface* RefDefault(Style style = SkTypeface::kNormal);
 
-    /** Return a new reference to the typeface that most closely matches the
-        requested familyName and style. Pass null as the familyName to return
-        the default font for the requested style. Will never return null
+    /** 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 style       The style (normal, bold, italic) of the typeface.
+        @param fontStyle   The style of the typeface.
         @return reference to the closest-matching typeface. Call must call
                 unref() when they are done.
-    */
-    static SkTypeface* CreateFromName(const char familyName[], Style style);
+     */
+    static SkTypeface* CreateFromName(const char familyName[],

[bungeman-skia, 2016/03/22 20:16:43]

You're not going to be able to change this signature like this without staging
it. There's no implicit conversion from the old 'unsigned' to SkFontStyle. In
other words, if this change is made to Skia then Skia won't be able to roll into
Chromium (without Chromium being simultaneously updated, as part of the roll).

[Mikus, 2016/03/24 12:08:26]

Done. Added and ifdef for the legacy code.

+                                      SkFontStyle fontStyle);
 
     /** Return a new reference to the typeface that most closely matches the
         requested typeface and specified Style. Use this call if you want to
         pick a new style from the same family of the existing typeface.
         If family is NULL, 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 reference to the closest-matching typeface. Call must call
                 unref() when they are done.
@@ skipping 281 matching lines @@
     SkFontStyle         fStyle;
     bool                fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif