commit 4ca0145243c5787483d0d8be43dd261b4f3f4241
author Mike Reed <reed@google.com> Thu Dec 13 10:08:05 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 13 15:35:10 2018 +0000
tree b7e2abd565c79a6ae452ba808ddca7cb9f14732e
parent 7da2fc7857dddb330773d63631dc4f4b954b54de

use font for measuring

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

gm/bigtext.cpp

diff --git a/gm/bigtext.cpp b/gm/bigtext.cpp
index 6b3c9b1..839609e 100644
--- a/gm/bigtext.cpp
+++ b/gm/bigtext.cpp
@@ -8,6 +8,7 @@
 #include "gm.h"
 #include "sk_tool_utils.h"
 #include "SkCanvas.h"
+#include "SkFont.h"
 #include "SkPath.h"
 
 /**
@@ -32,21 +33,20 @@
     void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
-        paint.setTextSize(1500);
+        SkFont font(sk_tool_utils::create_portable_typeface(), 1500);
 
         SkRect r;
-        (void)paint.measureText("/", 1, &r);
+        (void)font.measureText("/", 1, kUTF8_SkTextEncoding, &r);
         SkPoint pos = {
             this->width()/2 - r.centerX(),
             this->height()/2 - r.centerY()
         };
 
         paint.setColor(SK_ColorRED);
-        canvas->drawString("/", pos.fX, pos.fY, paint);
+        canvas->drawSimpleText("/", 1, kUTF8_SkTextEncoding, pos.fX, pos.fY, font, paint);
 
         paint.setColor(SK_ColorBLUE);
-        canvas->drawPosText("\\", 1, &pos, paint);
+        canvas->drawSimpleText("\\", 1, kUTF8_SkTextEncoding, pos.fX, pos.fY, font, paint);
     }
 
 private:

gm/bitmapcopy.cpp

diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp
index 28c6e79..469bf71 100644
--- a/gm/bitmapcopy.cpp
+++ b/gm/bitmapcopy.cpp
@@ -4,8 +4,10 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "gm.h"
 #include "sk_tool_utils.h"
+#include "SkFont.h"
 
 namespace skiagm {
 
@@ -84,16 +86,17 @@
 
         canvas->clear(0xFFDDDDDD);
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
+
+        SkFont font(sk_tool_utils::create_portable_typeface());
 
         SkScalar width = SkIntToScalar(40);
         SkScalar height = SkIntToScalar(40);
-        if (paint.getFontSpacing() > height) {
-            height = paint.getFontSpacing();
+        if (font.getSpacing() > height) {
+            height = font.getSpacing();
         }
         for (unsigned i = 0; i < NUM_CONFIGS; i++) {
             const char* name = color_type_name(src.colorType());
-            SkScalar textWidth = paint.measureText(name, strlen(name));
+            SkScalar textWidth = font.measureText(name, strlen(name), kUTF8_SkTextEncoding);
             if (textWidth > width) {
                 width = textWidth;
             }
@@ -106,10 +109,10 @@
             canvas->save();
             // Draw destination config name
             const char* name = color_type_name(fDst[i].colorType());
-            SkScalar textWidth = paint.measureText(name, strlen(name));
+            SkScalar textWidth = font.measureText(name, strlen(name), kUTF8_SkTextEncoding);
             SkScalar x = (width - textWidth) / SkScalar(2);
-            SkScalar y = paint.getFontSpacing() / SkScalar(2);
-            canvas->drawString(name, x, y, paint);
+            SkScalar y = font.getSpacing() / SkScalar(2);
+            canvas->drawSimpleText(name, strlen(name), kUTF8_SkTextEncoding, x, y, font, paint);
 
             // Draw destination bitmap
             canvas->translate(0, vertOffset);