SkTypeface::MakeFromName to take SkFontStyle.

gm/all_bitmap_configs.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 "sk_tool_utils.h"
 #include "SkSurface.h"
 #include "Resources.h"
@@ skipping 57 matching lines @@
     SkPaint p;
     p.setAntiAlias(false);
     p.setColor(SK_ColorWHITE);
     canvas->drawCircle(0.0f, 0.0f, SCALE * 0.5f, p);
 
     const double sqrt_3_over_2 = 0.8660254037844387;
     const SkScalar Z = 0.0f;
     const SkScalar D = 0.3f * SkIntToScalar(SCALE);
     const SkScalar X = SkDoubleToScalar(D * sqrt_3_over_2);
     const SkScalar Y = D * SK_ScalarHalf;
-    sk_tool_utils::set_portable_typeface(&p, nullptr, SkTypeface::kBold);
+    sk_tool_utils::set_portable_typeface(&p, nullptr, SkFontStyle::FromOldStyle(SkTypeface::kBold));
     p.setTextSize(0.28125f * SCALE);
     draw_center_letter('K', &p, SK_ColorBLACK, Z, Z, canvas);
     draw_center_letter('R', &p, SK_ColorRED, Z, D, canvas);
     draw_center_letter('G', &p, SK_ColorGREEN, -X, -Y, canvas);
     draw_center_letter('B', &p, SK_ColorBLUE, X, -Y, canvas);
     draw_center_letter('C', &p, SK_ColorCYAN, Z, -D, canvas);
     draw_center_letter('M', &p, SK_ColorMAGENTA, X, Y, canvas);
     draw_center_letter('Y', &p, SK_ColorYELLOW, -X, Y, canvas);
 }
 
@@ skipping 120 matching lines @@
     SkASSERT(notN32bitmap.colorType() == ct);
     return SkImage::MakeFromBitmap(notN32bitmap);
 }
 
 DEF_SIMPLE_GM(not_native32_bitmap_config, canvas, SCALE, SCALE) {
     sk_sp<SkImage> notN32image(make_not_native32_color_wheel());
     SkASSERT(notN32image);
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8);
     canvas->drawImage(notN32image.get(), 0.0f, 0.0f);
 }