SkTypeface::MakeFromName to take SkFontStyle.

gm/textblobrandomfont.cpp

 /*
  * Copyright 2015 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"
@@ skipping 21 matching lines @@
         SkTextBlobBuilder builder;
 
         const char* text = "The quick brown fox jumps over the lazy dog.";
 
         // make textbloben
         SkPaint paint;
         paint.setTextSize(32);
         paint.setLCDRenderText(true);
 
         // Setup our random scaler context
-        sk_sp<SkTypeface> orig(sk_tool_utils::create_portable_typeface("sans-serif",
-                                                                       SkTypeface::kBold));
+        sk_sp<SkTypeface> orig(sk_tool_utils::create_portable_typeface(
+                                   "sans-serif", SkFontStyle::FromOldStyle(SkTypeface::kBold)));
         if (nullptr == orig) {
             orig = SkTypeface::MakeDefault();
         }
         paint.setTypeface(sk_make_sp<SkRandomTypeface>(orig, paint, false));
 
         SkRect bounds;
         paint.measureText(text, strlen(text), &bounds);
         sk_tool_utils::add_to_text_blob(&builder, text, paint, 0, 0);
 
         // A8
@@ skipping 91 matching lines @@
     static const int kHeight = 1600;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new TextBlobRandomFont;)
 }
 #endif