commit c4745d6e517b2d8d831f98f748e730f64338634c
author Mike Reed <reed@google.com> Mon Jan 07 09:31:58 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 07 15:03:06 2019 +0000
tree 19fe5f5abf388c9a318953ea335208d1cab29ff4
parent a47eb455360f5c34147eaa9073f3a2c289615a6c

use drawString with font

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

gm/drawbitmaprect.cpp

diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 77125c5..251c247 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -170,13 +170,13 @@
         SkPaint blackPaint;
         SkScalar titleHeight = SK_Scalar1 * 24;
         blackPaint.setColor(SK_ColorBLACK);
-        blackPaint.setTextSize(titleHeight);
         blackPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&blackPaint);
+
+        SkFont font(sk_tool_utils::create_portable_typeface(), titleHeight);
+
         SkString title;
         title.printf("Bitmap size: %d x %d", gBmpSize, gBmpSize);
-        canvas->drawString(title, 0,
-                         titleHeight, blackPaint);
+        canvas->drawString(title, 0, titleHeight, font, blackPaint);
 
         canvas->translate(0, SK_Scalar1 * kPadY / 2  + titleHeight);
         int rowCount = 0;
@@ -191,12 +191,9 @@
                 label.appendf("%d x %d", w, h);
                 blackPaint.setAntiAlias(true);
                 blackPaint.setStyle(SkPaint::kFill_Style);
-                blackPaint.setTextSize(SK_Scalar1 * 10);
-                SkScalar baseline = dstRect.height() +
-                                    blackPaint.getTextSize() + SK_Scalar1 * 3;
-                canvas->drawString(label,
-                                    0, baseline,
-                                    blackPaint);
+                font.setSize(SK_Scalar1 * 10);
+                SkScalar baseline = dstRect.height() + font.getSize() + SK_Scalar1 * 3;
+                canvas->drawString(label, 0, baseline, font, blackPaint);
                 blackPaint.setStyle(SkPaint::kStroke_Style);
                 blackPaint.setStrokeWidth(SK_Scalar1);
                 blackPaint.setAntiAlias(false);