Replace SkTypeface::Style with 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 39 matching lines @@
     const SkPaint::FontMetrics& fMetrics;
     const char* fName;
     SkPath** fPaths;
     friend class SkTestTypeface;
     typedef SkRefCnt INHERITED;
 };
 
 
 class SkTestTypeface : public SkTypeface {
 public:
-    SkTestTypeface(SkTestFont* , SkTypeface::Style style);
+    SkTestTypeface(SkTestFont*, const SkFontStyle& style);
     virtual ~SkTestTypeface() {
         SkSafeUnref(fTestFont);
     }
     void getAdvance(SkGlyph* glyph);
     void getFontMetrics(SkPaint::FontMetrics* metrics);
     void getMetrics(SkGlyph* glyph);
     void getPath(const SkGlyph& glyph, SkPath* path);
 protected:
     virtual SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const SK_OVERRIDE;
     virtual void onFilterRec(SkScalerContextRec* rec) const SK_OVERRIDE;
@@ skipping 33 matching lines @@
         return 0;
     }
 private:
     SkTestFont* fTestFont;
     friend class SkTestScalerContext;
 };
 
 SkTypeface* CreateTestTypeface(const char* name, SkTypeface::Style style);
 
 #endif