SkTypeface::MakeFromName to take SkFontStyle.

gm/colortype.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 "SkGradientShader.h"
 #include "../src/fonts/SkGScalerContext.h"
 
 class ColorTypeGM : public skiagm::GM {
 public:
     ColorTypeGM() {}
 
 protected:
     void onOnceBeforeDraw() override {
         const SkColor colors[] = {
             SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE,
             SK_ColorMAGENTA, SK_ColorCYAN, SK_ColorYELLOW
         };
         SkMatrix local;
         local.setRotate(180);
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setShader(SkGradientShader::MakeSweep(0, 0, colors, nullptr, SK_ARRAY_COUNT(colors),
                                                     0, &local));
 
-        sk_sp<SkTypeface> orig(sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold));
+        sk_sp<SkTypeface> orig(sk_tool_utils::create_portable_typeface(
+                                   "serif", SkFontStyle::FromOldStyle(SkTypeface::kBold)));
         if (nullptr == orig) {
             orig = SkTypeface::MakeDefault();
         }
         fColorType = sk_make_sp<SkGTypeface>(std::move(orig), paint);
     }
 
     SkString onShortName() override {
         return SkString("colortype");
     }
 
@@ skipping 13 matching lines @@
         }
     }
 
 private:
     sk_sp<SkTypeface> fColorType;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new ColorTypeGM;)