SkTypeface::MakeFromName to take SkFontStyle.

gm/dftext.cpp

 /*
  * Copyright 2011 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 "Resources.h"
 #include "SkCanvas.h"
 #include "SkStream.h"
@@ skipping 52 matching lines @@
         SkCanvas* canvas = inputCanvas;
 #endif
         // apply global scale to test glyph positioning
         canvas->scale(1.05f, 1.05f);
         canvas->clear(0xffffffff);
 
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setSubpixelText(true);
 
-        sk_tool_utils::set_portable_typeface(&paint, "serif", SkTypeface::kNormal);
+        sk_tool_utils::set_portable_typeface(&paint, "serif");
 
         const char* text = "Hamburgefons";
         const size_t textLen = strlen(text);
 
         // check scaling up
         SkScalar x = SkIntToScalar(0);
         SkScalar y = SkIntToScalar(78);
         for (size_t i = 0; i < SK_ARRAY_COUNT(textSizes); ++i) {
             SkAutoCanvasRestore acr(canvas, true);
             canvas->translate(x, y);
@@ skipping 126 matching lines @@
     }
 
 private:
     sk_sp<SkTypeface> fEmojiTypeface;
     const char* fEmojiText;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new DFTextGM;)