commit dc5863c4d665dd323d29ef5f171803b02f67901e
author Mike Reed <reed@google.com> Sun Dec 23 23:19:14 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 24 04:48:15 2018 +0000
tree fabc394652115235822f28bf68ec4f1659bbb6aa
parent f16825ed3c715131489ed574ddd40533e7f0277f

use font in SkTextUtils

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

src/utils/SkTextUtils.cpp

diff --git a/src/utils/SkTextUtils.cpp b/src/utils/SkTextUtils.cpp
index 570643c..3ae9b06 100644
--- a/src/utils/SkTextUtils.cpp
+++ b/src/utils/SkTextUtils.cpp
@@ -8,19 +8,17 @@
 #include "SkTextUtils.h"
 #include "SkTextBlob.h"
 
-void SkTextUtils::DrawText(SkCanvas* canvas, const void* text, size_t size, SkScalar x, SkScalar y,
-                            const SkPaint& paint, Align align) {
-
-    SkFont font = SkFont::LEGACY_ExtractFromPaint(paint);
-
+void SkTextUtils::Draw(SkCanvas* canvas, const void* text, size_t size, SkTextEncoding encoding,
+                       SkScalar x, SkScalar y, const SkFont& font, const SkPaint& paint,
+                       Align align) {
     if (align != kLeft_Align) {
-        SkScalar width = font.measureText(text, size, paint.getTextEncoding());
+        SkScalar width = font.measureText(text, size, encoding);
         if (align == kCenter_Align) {
             width *= 0.5f;
         }
         x -= width;
     }
 
-    canvas->drawTextBlob(SkTextBlob::MakeFromText(text, size, font, paint.getTextEncoding()), x, y, paint);
+    canvas->drawTextBlob(SkTextBlob::MakeFromText(text, size, font, encoding), x, y, paint);
 }