Revert of Update typeface serialization style.

src/core/SkFontDescriptor.h

Index: src/core/SkFontDescriptor.h
diff --git a/src/core/SkFontDescriptor.h b/src/core/SkFontDescriptor.h
index cb8d2f4f03562484755e4147ca7b3fd85e4adfab..9b87365ed5b3fb1eeaa5cb116c70a9083aa31f92 100644
--- a/src/core/SkFontDescriptor.h
+++ b/src/core/SkFontDescriptor.h
@@ -50,14 +50,14 @@
 
 class SkFontDescriptor : SkNoncopyable {
 public:
-    SkFontDescriptor();
+    SkFontDescriptor(SkTypeface::Style = SkTypeface::kNormal);
     // Does not affect ownership of SkStream.
     static bool Deserialize(SkStream*, SkFontDescriptor* result);
 
     void serialize(SkWStream*);
 
-    SkFontStyle getStyle() { return fStyle; }
-    void setStyle(SkFontStyle style) { fStyle = style; }
+    SkTypeface::Style getStyle() { return fStyle; }
+    void setStyle(SkTypeface::Style style) { fStyle = style; }
 
     const char* getFamilyName() const { return fFamilyName.c_str(); }
     const char* getFullName() const { return fFullName.c_str(); }
@@ -78,7 +78,7 @@
     SkString fPostscriptName;
     SkAutoTDelete<SkFontData> fFontData;
 
-    SkFontStyle fStyle;
+    SkTypeface::Style fStyle;
 };
 
 #endif // SkFontDescriptor_DEFINED