Revert of Replace SkTypeface::Style with SkFontStyle.

src/ports/SkFontHost_FreeType_common.h

Index: src/ports/SkFontHost_FreeType_common.h
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index 79e6d651631103642729c4788fc55f8b3bf2ec5b..f093dba8a57532c5823731e6463c986f2214ba59 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -49,10 +49,10 @@
      *  name and style from a stream, using FreeType's API.
      */
     static bool ScanFont(SkStream* stream, int ttcIndex,
-                         SkString* name, SkFontStyle* style, bool* isFixedPitch);
+                         SkString* name, SkTypeface::Style* style, bool* isFixedPitch);
 
 protected:
-    SkTypeface_FreeType(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch)
+    SkTypeface_FreeType(Style style, SkFontID uniqueID, bool isFixedPitch)
         : INHERITED(style, uniqueID, isFixedPitch)
         , fGlyphCount(-1)
     {}