Switch some GMs over to using create_portable_typeface

This is in response to some Win7 vs Win10 font selection diffs on the compositor_quads_filter GM.

Change-Id: I9564d8a305b0bf773ddb31597b29878e0bc3323d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/287796
Reviewed-by: Michael Ludwig <[email protected]>
Commit-Queue: Robert Phillips <[email protected]>

Author: rphilli

gm/compositor_quads.cpp

@@ -39,6 +39,7 @@
 #include "include/private/SkTArray.h"
 #include "src/core/SkLineClipper.h"
 #include "tools/Resources.h"
+#include "tools/ToolUtils.h"
 #include "tools/gpu/YUVUtils.h"
 
 #include <array>
@@ -187,7 +188,8 @@ static void draw_clipping_boundaries(SkCanvas* canvas, const SkMatrix& local) {
 }
 
 static void draw_text(SkCanvas* canvas, const char* text) {
-    canvas->drawString(text, 0, 0, SkFont(nullptr, 12), SkPaint());
+    SkFont font(ToolUtils::create_portable_typeface(), 12);
+    canvas->drawString(text, 0, 0, font, SkPaint());
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////

gm/drawquadset.cpp

@@ -29,6 +29,7 @@
 #include "src/gpu/GrPaint.h"
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/SkGr.h"
+#include "tools/ToolUtils.h"
 
 #include <utility>
 
@@ -39,7 +40,8 @@ static constexpr int kRowCount = 4;
 static constexpr int kColCount = 3;
 
 static void draw_text(SkCanvas* canvas, const char* text) {
-    canvas->drawString(text, 0, 0, SkFont(nullptr, 12), SkPaint());
+    SkFont font(ToolUtils::create_portable_typeface(), 12);
+    canvas->drawString(text, 0, 0, font, SkPaint());
 }
 
 static void draw_gradient_tiles(SkCanvas* canvas, bool alignGradients) {

gm/gradients_degenerate.cpp

@@ -20,6 +20,7 @@
 #include "include/core/SkTileMode.h"
 #include "include/core/SkTypes.h"
 #include "include/effects/SkGradientShader.h"
+#include "tools/ToolUtils.h"
 
 // NOTE: The positions define hardstops for the red and green borders. For the repeating degenerate
 // gradients, that means the red and green are never visible, so the average color used should only
@@ -46,8 +47,9 @@ typedef sk_sp<SkShader> (*GradientFactory)(SkTileMode tm);
 static void draw_tile_header(SkCanvas* canvas) {
     canvas->save();
 
+    SkFont font(ToolUtils::create_portable_typeface(), 12);
     for (int i = 0; i < TILE_MODE_CT; ++i) {
-        canvas->drawString(TILE_NAMES[i], 0, 0, SkFont(), SkPaint());
+        canvas->drawString(TILE_NAMES[i], 0, 0, font, SkPaint());
         canvas->translate(TILE_SIZE + TILE_GAP, 0);
     }
 
@@ -63,8 +65,10 @@ static void draw_row(SkCanvas* canvas, const char* desc, GradientFactory factory
     SkPaint text;
     text.setAntiAlias(true);
 
+    SkFont font(ToolUtils::create_portable_typeface(), 12);
+
     canvas->translate(0, TILE_GAP);
-    canvas->drawString(desc, 0, 0, SkFont(), text);
+    canvas->drawString(desc, 0, 0, font, text);
     canvas->translate(0, TILE_GAP);
 
     SkPaint paint;