SkTypeface::MakeFromName to take SkFontStyle.

gm/variedtext.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 34 matching lines @@
 
     void onOnceBeforeDraw() override {
         fPaint.setAntiAlias(true);
         fPaint.setLCDRenderText(fLCD);
 
         SkISize size = this->getISize();
         SkScalar w = SkIntToScalar(size.fWidth);
         SkScalar h = SkIntToScalar(size.fHeight);
 
         static_assert(4 == SK_ARRAY_COUNT(fTypefaces), "typeface_cnt");
-        fTypefaces[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kNormal);
-        fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kBold);
-        fTypefaces[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal);
-        fTypefaces[3] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold);
+        fTypefaces[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkFontStyle());
+        fTypefaces[1] = sk_tool_utils::create_portable_typeface("sans-serif",
+                            SkFontStyle::FromOldStyle(SkTypeface::kBold));
+        fTypefaces[2] = sk_tool_utils::create_portable_typeface("serif", SkFontStyle());
+        fTypefaces[3] = sk_tool_utils::create_portable_typeface("serif",
+                            SkFontStyle::FromOldStyle(SkTypeface::kBold));
 
         SkRandom random;
         for (int i = 0; i < kCnt; ++i) {
             int length = random.nextRangeU(kMinLength, kMaxLength);
             char text[kMaxLength];
             for (int j = 0; j < length; ++j) {
                 text[j] = (char)random.nextRangeU('!', 'z');
             }
             fStrings[i].set(text, length);
 
@@ skipping 80 matching lines @@
     SkPoint         fPositions[kCnt];
     SkRect          fClipRects[kCnt];
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new VariedTextGM(false, false);)
 DEF_GM(return new VariedTextGM(true, false);)
 DEF_GM(return new VariedTextGM(false, true);)
 DEF_GM(return new VariedTextGM(true, true);)