Revert of Update typeface serialization style.

src/core/SkFontDescriptor.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontDescriptor_DEFINED
 #define SkFontDescriptor_DEFINED
 
@@ skipping 32 matching lines @@
 
 private:
     SkAutoTDelete<SkStreamAsset> fStream;
     int fIndex;
     int fAxisCount;
     SkAutoSTMalloc<4, SkFixed> fAxis;
 };
 
 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(); }
     const char* getPostscriptName() const { return fPostscriptName.c_str(); }
     bool hasFontData() const { return fFontData.get() != nullptr; }
     SkFontData* detachFontData() { return fFontData.release(); }
 
     void setFamilyName(const char* name) { fFamilyName.set(name); }
     void setFullName(const char* name) { fFullName.set(name); }
     void setPostscriptName(const char* name) { fPostscriptName.set(name); }
     /** Set the font data only if it is necessary for serialization.
      *  This method takes ownership of the font data. */
     void setFontData(SkFontData* data) { fFontData.reset(data); }
 
 private:
     SkString fFamilyName;
     SkString fFullName;
     SkString fPostscriptName;
     SkAutoTDelete<SkFontData> fFontData;
 
-    SkFontStyle fStyle;
+    SkTypeface::Style fStyle;
 };
 
 #endif // SkFontDescriptor_DEFINED