Revert of Update typeface serialization style.

src/core/SkFontDescriptor.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontDescriptor.h"
 #include "SkStream.h"
 #include "SkData.h"
 
 enum {
     // these must match the sfnt 'name' enums
     kFontFamilyName = 0x01,
     kFullName       = 0x04,
     kPostscriptName = 0x06,
 
     // These count backwards from 0xFF, so as not to collide with the SFNT
     // defines for names in its 'name' table.
     kFontAxes       = 0xFC,
     kFontIndex      = 0xFD,
     kFontFileName   = 0xFE,  // Remove when MIN_PICTURE_VERSION > 41
     kSentinel       = 0xFF,
 };
 
-SkFontDescriptor::SkFontDescriptor() { }
+SkFontDescriptor::SkFontDescriptor(SkTypeface::Style style) : fStyle(style) { }
 
 static void read_string(SkStream* stream, SkString* string) {
     const uint32_t length = SkToU32(stream->readPackedUInt());
     if (length > 0) {
         string->resize(length);
         stream->read(string->writable_str(), length);
     }
 }
 
 // Remove when MIN_PICTURE_VERSION > 41
@@ skipping 15 matching lines @@
 static size_t read_uint(SkStream* stream) {
     return stream->readPackedUInt();
 }
 
 static void write_uint(SkWStream* stream, size_t n, uint32_t id) {
     stream->writePackedUInt(id);
     stream->writePackedUInt(n);
 }
 
 bool SkFontDescriptor::Deserialize(SkStream* stream, SkFontDescriptor* result) {
-    size_t styleBits = stream->readPackedUInt();
-    if (styleBits <= 2) {
-        // Remove this branch when MIN_PICTURE_VERSION > 45
-        result->fStyle = SkFontStyle::FromOldStyle(styleBits);
-    } else {
-        result->fStyle = SkFontStyle((styleBits >> 16) & 0xFFFF,
-                                     (styleBits >> 8 ) & 0xFF,
-                                     static_cast<SkFontStyle::Slant>(styleBits & 0xFF));
-    }
+    result->fStyle = (SkTypeface::Style)stream->readPackedUInt();
 
     SkAutoSTMalloc<4, SkFixed> axis;
     size_t axisCount = 0;
     size_t index = 0;
     for (size_t id; (id = stream->readPackedUInt()) != kSentinel;) {
         switch (id) {
             case kFontFamilyName:
                 read_string(stream, &result->fFamilyName);
                 break;
             case kFullName:
@@ skipping 29 matching lines @@
                                                    index, axis, axisCount));
         } else {
             SkDEBUGFAIL("Could not read font data");
             return false;
         }
     }
     return true;
 }
 
 void SkFontDescriptor::serialize(SkWStream* stream) {
-    uint32_t styleBits = (fStyle.weight() << 16) | (fStyle.width() << 8) | (fStyle.slant());
-    stream->writePackedUInt(styleBits);
+    stream->writePackedUInt(fStyle);
 
     write_string(stream, fFamilyName, kFontFamilyName);
     write_string(stream, fFullName, kFullName);
     write_string(stream, fPostscriptName, kPostscriptName);
     if (fFontData.get()) {
         if (fFontData->getIndex()) {
             write_uint(stream, fFontData->getIndex(), kFontIndex);
         }
         if (fFontData->getAxisCount()) {
             write_uint(stream, fFontData->getAxisCount(), kFontAxes);
             for (int i = 0; i < fFontData->getAxisCount(); ++i) {
                 stream->writePackedUInt(fFontData->getAxis()[i]);
             }
         }
     }
 
     stream->writePackedUInt(kSentinel);
 
     if (fFontData.get() && fFontData->hasStream()) {
         SkAutoTDelete<SkStreamAsset> fontData(fFontData->detachStream());
         size_t length = fontData->getLength();
         stream->writePackedUInt(length);
         stream->writeStream(fontData, length);
     } else {
         stream->writePackedUInt(0);
     }
 }