commit df2d27e0c7d94f13b7bfacdfb0a8263ceb644f66
author Hal Canary <halcanary@google.com> Tue Jan 08 09:38:02 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 09 16:01:59 2019 +0000
tree 6b16b5458f45894be4765a65b183ec1cbcd6fb59
parent 0995fd5cb71d9532703e0f9ee6c3b667978adff1

drawText Cleanup, part 2

Change-Id: I6765d623924d12c6eea2c402dd27eade61b73b66
Reviewed-on: https://skia-review.googlesource.com/c/182151
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>

gm/poly2poly.cpp

diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp
index 7b72aa4..7e79839 100644
--- a/gm/poly2poly.cpp
+++ b/gm/poly2poly.cpp
@@ -38,11 +38,13 @@
     SkPaint     fFillPaint;
     SkPaint     fStrokePaint;
     SkPath      fPath;
+    SkFont      fFont;
 };
 
-SkJSCanvas::SkJSCanvas(SkCanvas* target) : fTarget(target) {
+SkJSCanvas::SkJSCanvas(SkCanvas* target)
+        : fTarget(target)
+        , fFont(sk_tool_utils::create_portable_typeface(), 12) {
     fFillPaint.setAntiAlias(true);
-    sk_tool_utils::set_portable_typeface(&fFillPaint);
     fStrokePaint.setAntiAlias(true);
     fStrokePaint.setStyle(SkPaint::kStroke_Style);
     fStrokePaint.setStrokeWidth(SK_Scalar1);
@@ -74,7 +76,7 @@
 }
 
 void SkJSCanvas::fillText(const char text[], double x, double y) {
-    fTarget->drawString(text, SkDoubleToScalar(x), SkDoubleToScalar(y), fFillPaint);
+    fTarget->drawString(text, SkDoubleToScalar(x), SkDoubleToScalar(y), fFont, fFillPaint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////