Replace SkTypeface::Style with SkFontStyle.

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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDescriptor.h"
@@ skipping 92 matching lines @@
                     path->close();
                     break;
                 default:
                     SkDEBUGFAIL("bad verb");
                     return;
             }
         }
         fPaths[index] = path;
     }
 }
-    
-SkTestTypeface::SkTestTypeface(SkTestFont* testFont, SkTypeface::Style style)
+
+SkTestTypeface::SkTestTypeface(SkTestFont* testFont, const SkFontStyle& style)
     : SkTypeface(style, SkTypefaceCache::NewFontID(), false)
     , fTestFont(testFont) {
 }
 
 void SkTestTypeface::getAdvance(SkGlyph* glyph) {
     glyph->fAdvanceX = fTestFont->fWidths[SkGlyph::ID2Code(glyph->fID)];
     glyph->fAdvanceY = 0;
 }
 
 void SkTestTypeface::getFontMetrics(SkPaint::FontMetrics* metrics) {
@@ skipping 163 matching lines @@
     }
 
 private:
     SkTestTypeface*  fFace;
     SkMatrix         fMatrix;
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
     return SkNEW_ARGS(SkTestScalerContext, (const_cast<SkTestTypeface*>(this), desc));
 }