Replace SkTypeface::Style with SkFontStyle.

src/fonts/SkGScalerContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGScalerContext.h"
 #include "SkGlyph.h"
 #include "SkPath.h"
@@ skipping 140 matching lines @@
         metrics->fXMax = SkScalarMul(metrics->fXMax, scale);
         metrics->fXHeight = SkScalarMul(metrics->fXHeight, scale);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkTypefaceCache.h"
 
 SkGTypeface::SkGTypeface(SkTypeface* proxy, const SkPaint& paint)
-    : SkTypeface(proxy->style(), SkTypefaceCache::NewFontID(), false)
+    : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)
     , fProxy(SkRef(proxy))
     , fPaint(paint) {}
 
 SkGTypeface::~SkGTypeface() {
     fProxy->unref();
 }
 
 SkScalerContext* SkGTypeface::onCreateScalerContext(
                                             const SkDescriptor* desc) const {
     return SkNEW_ARGS(SkGScalerContext, (const_cast<SkGTypeface*>(this), desc));
@@ skipping 85 matching lines @@
 
     friend class SkGFontBuilder;
     SkGFont(int count, Glyph* array);
 };
 
 class SkGFontBuilder {
 public:
 
 };
 #endif