SkTypeface::MakeFromName to take SkFontStyle.

gm/texteffects.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 250 matching lines @@
     }
 }
 
 DEF_SIMPLE_GM(fancyunderline, canvas, 900, 1350) {
     SkPaint paint;
     paint.setAntiAlias(true);
     const char* fam[] = { "sans-serif", "serif", "monospace" };
     const char test[] = "aAjJgGyY_|{-(~[,]qQ}pP}zZ";
     SkPoint textPt = { 10, 80 };
     for (int font = 0; font < 3; ++font) {
-        sk_tool_utils::set_portable_typeface(&paint, fam[font], SkTypeface::kNormal);
+        sk_tool_utils::set_portable_typeface(&paint, fam[font]);
         for (SkScalar textSize = 100; textSize > 10; textSize -= 20) {
             paint.setTextSize(textSize);
             const SkScalar uWidth = textSize / 15;
             paint.setStrokeWidth(uWidth);
             paint.setStyle(SkPaint::kFill_Style);
             canvas->drawText(test, sizeof(test) - 1, textPt.fX, textPt.fY, paint);
 
             SkTDArray<SkScalar> intersections;
             find_intercepts(test, sizeof(test) - 1, textPt.fX, textPt.fY, paint, uWidth,
                 &intersections);
@@ skipping 23 matching lines @@
     }
 }
 
 DEF_SIMPLE_GM(fancyposunderline, canvas, 900, 1350) {
     SkPaint paint;
     paint.setAntiAlias(true);
     const char* fam[] = { "sans-serif", "serif", "monospace" };
     const char test[] = "aAjJgGyY_|{-(~[,]qQ}pP}zZ";
     SkPoint textPt = { 10, 80 };
     for (int font = 0; font < 3; ++font) {
-        sk_tool_utils::set_portable_typeface(&paint, fam[font], SkTypeface::kNormal);
+        sk_tool_utils::set_portable_typeface(&paint, fam[font]);
         for (SkScalar textSize = 100; textSize > 10; textSize -= 20) {
             paint.setTextSize(textSize);
             const SkScalar uWidth = textSize / 15;
             paint.setStrokeWidth(uWidth);
             paint.setStyle(SkPaint::kFill_Style);
             int widthCount = paint.getTextWidths(test, sizeof(test) - 1, nullptr);
             SkTDArray<SkScalar> widths;
             widths.setCount(widthCount);
             (void) paint.getTextWidths(test, sizeof(test) - 1, widths.begin());
             SkTDArray<SkPoint> pos;
@@ skipping 54 matching lines @@
 
         SkScalar start = textPt.fX;
         SkScalar end = posX;
         SkScalar uPos = pos[0].fY + uWidth;
         SkPath underline = create_underline(intersections, start, end, uPos, uWidth, textSize);
         paint.setStyle(SkPaint::kStroke_Style);
         canvas->drawPath(underline, paint);
         canvas->translate(0, textSize * 1.3f);
     }
 }