commit 7d1eb33aec65843e4fe6bd820b5a432767686341
author Mike Reed <reed@google.com> Tue Dec 04 17:35:56 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 04 23:20:44 2018 +0000
tree 872740253df168850acc8448c30489a215ec2277
parent 5138990abe603f0e09bea07c59e7748ff19cc6af

hide paint's getFontBounds

Bug: skia:
Change-Id: I26b693e32d0dadfe47710a29296eceb8ec90ee0c
Reviewed-on: https://skia-review.googlesource.com/c/174308
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Herb Derby <herb@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index efa75a9..ef149f9 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2530,13 +2530,14 @@
 }
 
 // These call the (virtual) onDraw... method
-void SkCanvas::drawSimpleText(const void* text, size_t byteLength, SkTextEncoding,
+void SkCanvas::drawSimpleText(const void* text, size_t byteLength, SkTextEncoding encoding,
                               SkScalar x, SkScalar y, const SkFont& font, const SkPaint& paint) {
     TRACE_EVENT0("skia", TRACE_FUNC);
     if (byteLength) {
         sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
         SkPaint tmp(paint);
         font.LEGACY_applyToPaint(&tmp);
+        tmp.setTextEncoding(encoding);
         this->onDrawText(text, byteLength, x, y, tmp);
     }
 }