Revert of Update typeface serialization style.

src/fonts/SkTestScalerContext.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 138 matching lines @@
                                 uint32_t glyphIDsCount) const {
 // pdf only
     SkAdvancedTypefaceMetrics* info = new SkAdvancedTypefaceMetrics;
     info->fFontName.set(fTestFont->fName);
     info->fLastGlyphID = SkToU16(onCountGlyphs() - 1);
     return info;
 }
 
 void SkTestTypeface::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const {
     desc->setFamilyName(fTestFont->fName);
-    desc->setStyle(this->fontStyle());
     *isLocal = false;
 }
 
 int SkTestTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
                             uint16_t glyphs[], int glyphCount) const {
     SkASSERT(encoding == kUTF16_Encoding);
     for (int index = 0; index < glyphCount; ++index) {
         SkUnichar ch = ((SkUnichar*) chars)[index];
         glyphs[index] = fTestFont->codeToIndex(ch);
     }
@@ skipping 112 matching lines @@
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
                                                        const SkDescriptor* desc) const {
     return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), effects, desc);
 }