SkTypeface::MakeFromName to take SkFontStyle.

src/fonts/SkTestScalerContext.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 SkTestScalerContext_DEFINED
 #define SkTestScalerContext_DEFINED
 
@@ skipping 23 matching lines @@
     
 
     SkTestFont(const SkTestFontData& );
     virtual ~SkTestFont();
     int codeToIndex(SkUnichar charCode) const;
     void init(const SkScalar* pts, const unsigned char* verbs);
 #ifdef SK_DEBUG  // detect missing test font data
     mutable unsigned char fDebugBits[16];
     mutable SkUnichar fDebugOverage[8];
     const char* fDebugName;
-    SkTypeface::Style fDebugStyle;
+    SkFontStyle fDebugStyle;
     const char* debugFontName() const { return fName; }
 #endif
 private:
     const unsigned* fCharCodes;
     const size_t fCharCodesCount;
     const SkFixed* fWidths;
     const SkPaint::FontMetrics& fMetrics;
     const char* fName;
     SkPath** fPaths;
     friend class SkTestTypeface;
@@ skipping 50 matching lines @@
         return 0;
     }
 private:
     SkTestFont* fTestFont;
     friend class SkTestScalerContext;
 };
 
 SkTypeface* CreateTestTypeface(const char* name, SkTypeface::Style style);
 
 #endif