SkTypeface::MakeFromName to take SkFontStyle.

samplecode/SampleFilterFuzz.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 "SampleCode.h"
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkAlphaThresholdFilter.h"
@@ skipping 180 matching lines @@
 }
 
 static SkBlurMaskFilter::BlurFlags make_blur_mask_filter_flag() {
     return static_cast<SkBlurMaskFilter::BlurFlags>(R(SkBlurMaskFilter::kAll_BlurFlag+1));
 }
 
 static SkFilterQuality make_filter_quality() {
     return static_cast<SkFilterQuality>(R(kHigh_SkFilterQuality+1));
 }
 
-static SkTypeface::Style make_typeface_style() {
-    return static_cast<SkTypeface::Style>(R(SkTypeface::kBoldItalic+1));
+static SkFontStyle make_typeface_style() {
+    return SkFontStyle::FromOldStyle(SkTypeface::kBoldItalic+1);
 }
 
 static SkPath1DPathEffect::Style make_path_1d_path_effect_style() {
     return static_cast<SkPath1DPathEffect::Style>(R((int)SkPath1DPathEffect::kLastEnum_Style + 1));
 }
 
 static SkColor make_color() {
     return (R(2) == 1) ? 0xFFC0F0A0 : 0xFF000090;
 }
 
@@ skipping 617 matching lines @@
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ImageFilterFuzzView; }
 static SkViewRegister reg(MyFactory);