commit 2e6db18c4309f7f2036e40abf77804086132c237
author Mike Reed <reed@google.com> Sat Dec 15 13:45:33 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Dec 15 19:11:13 2018 +0000
tree 73ede5ecc197ec747544c311c0c4d518b17e7c6f
parent 282ec5dc6ca7acc49cd4c43ce85a73f0d487ffc9

use font instead of paint

Bug: skia:
Change-Id: I82b0b37c8e7b295df62cefb4053dcfeba1521e27
Reviewed-on: https://skia-review.googlesource.com/c/177803
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gm/complexclip.cpp

diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index 1d3359f..415151f 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -8,6 +8,7 @@
 #include "gm.h"
 #include "sk_tool_utils.h"
 #include "SkCanvas.h"
+#include "SkFont.h"
 #include "SkPath.h"
 
 namespace skiagm {
@@ -68,10 +69,7 @@
         SkPath clipB;
         clipB.addPoly({{40,  10}, {190, 15}, {195, 190}, {40,  185}, {155, 100}}, false).close();
 
-        SkPaint paint;
-        paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
-        paint.setTextSize(20);
+        SkFont font(sk_tool_utils::create_portable_typeface(), 20);
 
         constexpr struct {
             SkClipOp fOp;
@@ -137,17 +135,19 @@
                 canvas->restore();
 
 
+                SkPaint paint;
                 SkScalar txtX = 45;
                 paint.setColor(gClipAColor);
                 const char* aTxt = doInvA ? "InvA " : "A ";
-                canvas->drawString(aTxt, txtX, 220, paint);
-                txtX += paint.measureText(aTxt, strlen(aTxt));
+                canvas->drawSimpleText(aTxt, strlen(aTxt), kUTF8_SkTextEncoding, txtX, 220, font, paint);
+                txtX += font.measureText(aTxt, strlen(aTxt), kUTF8_SkTextEncoding);
                 paint.setColor(SK_ColorBLACK);
-                canvas->drawString(gOps[op].fName, txtX, 220, paint);
-                txtX += paint.measureText(gOps[op].fName, strlen(gOps[op].fName));
+                canvas->drawSimpleText(gOps[op].fName, strlen(gOps[op].fName), kUTF8_SkTextEncoding, txtX, 220,
+                                       font, paint);
+                txtX += font.measureText(gOps[op].fName, strlen(gOps[op].fName), kUTF8_SkTextEncoding);
                 paint.setColor(gClipBColor);
                 const char* bTxt = doInvB ? "InvB " : "B ";
-                canvas->drawString(bTxt, txtX, 220, paint);
+                canvas->drawSimpleText(bTxt, strlen(bTxt), kUTF8_SkTextEncoding, txtX, 220, font, paint);
 
                 canvas->translate(250,0);
             }