commit 4f81bb73311d8fddb99a3a42b65334de681dd595
author Mike Reed <reed@google.com> Wed Jan 23 09:23:00 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 23 14:50:35 2019 +0000
tree 4933d416efef205fa196ba9992cb10da7104e48e
parent d562545e8a239e18bf9dfdc6959b12780507b1ca

remove all support for drawText

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

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 2258acb..5f342c4 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2542,20 +2542,7 @@
         this->drawTextBlob(SkTextBlob::MakeFromText(text, byteLength, font, encoding), x, y, paint);
     }
 }
-#ifdef SK_SUPPORT_LEGACY_CANVAS_DRAW_TEXT
-void SkCanvas::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                        const SkPaint& paint) {
-#ifdef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
-    TRACE_EVENT0("skia", TRACE_FUNC);
-    if (byteLength) {
-        sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
-        const SkFont font = SkFont::LEGACY_ExtractFromPaint(paint);
-        const SkTextEncoding encoding = paint.private_internal_getTextEncoding();
-        this->drawTextBlob(SkTextBlob::MakeFromText(text, byteLength, font, encoding), x, y, paint);
-    }
-#endif
-}
-#endif
+
 void SkCanvas::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                             const SkPaint& paint) {
     TRACE_EVENT0("skia", TRACE_FUNC);