commit 12a6d452b1260d8f8c34711fda06c03e27b0a54d
author Mike Reed <reed@google.com> Fri Dec 21 22:22:31 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Dec 22 12:23:07 2018 +0000
tree d1694a928baa26715e393676e359ce241be49f07
parent c983480b117f413c808081d76087afc25a90b762

use font for measuring

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

tools/sk_tool_utils.h

diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h
index 645ac5d..01ad89c 100644
--- a/tools/sk_tool_utils.h
+++ b/tools/sk_tool_utils.h
@@ -11,6 +11,7 @@
 #include "SkColor.h"
 #include "SkData.h"
 #include "SkEncodedImageFormat.h"
+#include "SkFont.h"
 #include "SkFontStyle.h"
 #include "SkFontTypes.h"
 #include "SkImageEncoder.h"
@@ -27,7 +28,6 @@
 
 class SkBitmap;
 class SkCanvas;
-class SkFont;
 class SkFontStyle;
 class SkImage;
 class SkPaint;
@@ -126,11 +126,16 @@
     sk_sp<SkSurface> makeSurface(SkCanvas*, const SkImageInfo&, const SkSurfaceProps* = nullptr);
 
     // A helper for inserting a drawtext call into a SkTextBlobBuilder
-    void add_to_text_blob_w_len(SkTextBlobBuilder* builder, const char* text, size_t len,
-                                const SkPaint& origPaint, SkScalar x, SkScalar y);
+    void add_to_text_blob_w_len(SkTextBlobBuilder*, const char* text, size_t len, SkTextEncoding,
+                                const SkFont&, SkScalar x, SkScalar y);
 
-    void add_to_text_blob(SkTextBlobBuilder* builder, const char* text,
-                          const SkPaint& origPaint, SkScalar x, SkScalar y);
+    void add_to_text_blob(SkTextBlobBuilder*, const char* text, const SkFont&,
+                          SkScalar x, SkScalar y);
+
+    static inline void add_to_text_blob(SkTextBlobBuilder* builder, const char* text,
+                                        const SkPaint& paint, SkScalar x, SkScalar y) {
+        add_to_text_blob(builder, text, SkFont::LEGACY_ExtractFromPaint(paint), x, y);
+    }
 
     // Constructs a star by walking a 'numPts'-sided regular polygon with even/odd fill:
     //