Revert of Replace SkTypeface::Style with SkFontStyle.

src/ports/SkFontConfigTypeface.h

Index: src/ports/SkFontConfigTypeface.h
diff --git a/src/ports/SkFontConfigTypeface.h b/src/ports/SkFontConfigTypeface.h
index c7d8e26032b3b6baac0743edb283efc172f545ff..f62d99d2f45acf5ce85e7b591f6a3ed01cd7091d 100644
--- a/src/ports/SkFontConfigTypeface.h
+++ b/src/ports/SkFontConfigTypeface.h
@@ -18,14 +18,13 @@
     SkStream* fLocalStream;
 
 public:
-    static FontConfigTypeface* Create(const SkFontStyle& style,
+    static FontConfigTypeface* Create(Style style,
                                       const SkFontConfigInterface::FontIdentity& fi,
                                       const SkString& familyName) {
         return SkNEW_ARGS(FontConfigTypeface, (style, fi, familyName));
     }
 
-    static FontConfigTypeface* Create(const SkFontStyle& style, bool fixedWidth,
-                                      SkStream* localStream) {
+    static FontConfigTypeface* Create(Style style, bool fixedWidth, SkStream* localStream) {
         return SkNEW_ARGS(FontConfigTypeface, (style, fixedWidth, localStream));
     }
 
@@ -51,7 +50,7 @@
 protected:
     friend class SkFontHost;    // hack until we can make public versions
 
-    FontConfigTypeface(const SkFontStyle& style,
+    FontConfigTypeface(Style style,
                        const SkFontConfigInterface::FontIdentity& fi,
                        const SkString& familyName)
             : INHERITED(style, SkTypefaceCache::NewFontID(), false)
@@ -59,7 +58,7 @@
             , fFamilyName(familyName)
             , fLocalStream(NULL) {}
 
-    FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStream* localStream)
+    FontConfigTypeface(Style style, bool fixedWidth, SkStream* localStream)
             : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) {
         // we default to empty fFamilyName and fIdentity
         fLocalStream = localStream;