Replace SkTypeface::Style with SkFontStyle.

include/core/SkFontStyle.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontStyle_DEFINED
 #define SkFontStyle_DEFINED
 
@@ skipping 25 matching lines @@
         kUltaExpanded_Width     = 9
     };
 
     enum Slant {
         kUpright_Slant,
         kItalic_Slant,
     };
 
     SkFontStyle();
     SkFontStyle(int weight, int width, Slant);
+    explicit SkFontStyle(unsigned oldStyle);
 
     bool operator==(const SkFontStyle& rhs) const {
         return fUnion.fU32 == rhs.fUnion.fU32;
     }
 
     int weight() const { return fUnion.fR.fWeight; }
     int width() const { return fUnion.fR.fWidth; }
     Slant slant() const { return (Slant)fUnion.fR.fSlant; }
 
     bool isItalic() const {
         return kItalic_Slant == fUnion.fR.fSlant;
     }
 
 private:
     union {
         struct {
             uint16_t fWeight;   // 100 .. 900
             uint8_t  fWidth;    // 1 .. 9
             uint8_t  fSlant;    // 0 .. 2
         } fR;
         uint32_t    fU32;
     } fUnion;
 };
 
 #endif