SkTypeface::MakeFromName to take SkFontStyle.

gm/fontcache.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkGraphics.h"
@@ skipping 14 matching lines @@
 protected:
     SkString onShortName() override {
         return SkString("fontcache");
     }
 
     SkISize onISize() override {
         return SkISize::Make(1280, 640);
     }
 
     void onOnceBeforeDraw() override {
-        fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kItalic);
-        fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kItalic);
+        fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif",
+            SkFontStyle::FromOldStyle(SkTypeface::kItalic));
+        fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif",
+            SkFontStyle::FromOldStyle(SkTypeface::kItalic));
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setLCDRenderText(true);
         paint.setSubpixelText(true);
         paint.setTypeface(fTypefaces[0]);
         paint.setTextSize(192);
 
@@ skipping 22 matching lines @@
 
 private:
     sk_sp<SkTypeface> fTypefaces[2];
     typedef GM INHERITED;
 };
 
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new FontCacheGM;)