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 12 matching lines @@
 struct SkScalerContextRec;
 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_CREATE_FROM_NAME
+#define SK_DONT_USE_LEGACY_TYPEFACE_CREATE_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 49 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
+#ifndef SK_DONT_USE_LEGACY_TYPEFACE_CREATE_FROM_NAME
+    static SkTypeface* CreateFromName(const char familyName[], Style style);
+#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 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[],
+                                      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