SkCanvas::drawText: remove calls

Change-Id: Id5a870d9b94ce5510fd6e0fd75f52550e598139b
Reviewed-on: https://skia-review.googlesource.com/c/182449
Commit-Queue: Mike Reed <[email protected]>
Auto-Submit: Hal Canary <[email protected]>
Reviewed-by: Mike Reed <[email protected]>

Author: HalCanary

include/core/SkPaint.h

@@ -1159,6 +1159,7 @@ class SK_API SkPaint {
     friend class SkFont;
     friend class SkGlyphRunListPainter;
     friend class SkPaintPriv;
+    friend class SkPicturePlayback;
     friend class SkPDFDevice;
     friend class SkScalerContext;  // for computeLuminanceColor()
     friend class SkTextBaseIter;

src/core/SkPicturePlayback.cpp

@@ -578,7 +578,9 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
             BREAK_ON_READ_ERROR(reader);
 
             if (paint && text.text()) {
-                canvas->drawText(text.text(), text.length(), x, y, *paint);
+                canvas->drawSimpleText(text.text(), text.length(),
+                                       paint->private_internal_getTextEncoding(),
+                                       x, y, SkFont::LEGACY_ExtractFromPaint(*paint), *paint);
             }
         } break;
         case DRAW_TEXT_BLOB: {
@@ -606,7 +608,9 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
             float top = ptr[2];
             float bottom = ptr[3];
             if (top < clip.fBottom && bottom > clip.fTop && paint && text.text()) {
-                canvas->drawText(text.text(), text.length(), ptr[0], ptr[1], *paint);
+                canvas->drawSimpleText(text.text(), text.length(),
+                                       paint->private_internal_getTextEncoding(), ptr[0], ptr[1],
+                                       SkFont::LEGACY_ExtractFromPaint(*paint), *paint);
             }
         } break;
         case DRAW_TEXT_ON_PATH_RETIRED_08_2018_REMOVED_10_2018: {

src/utils/SkLua.cpp

@@ -559,9 +559,11 @@ static int lcanvas_drawText(lua_State* L) {
     if (lua_isstring(L, 2) && lua_isnumber(L, 3) && lua_isnumber(L, 4)) {
         size_t len;
         const char* text = lua_tolstring(L, 2, &len);
-        get_ref<SkCanvas>(L, 1)->drawText(text, len,
-                                          lua2scalar(L, 3), lua2scalar(L, 4),
-                                          *get_obj<SkPaint>(L, 5));
+        get_ref<SkCanvas>(L, 1)->drawSimpleText(
+                text, len, kUTF8_SkTextEncoding,
+                lua2scalar(L, 3), lua2scalar(L, 4),
+                SkFont::LEGACY_ExtractFromPaint(*get_obj<SkPaint>(L, 5)),
+                *get_obj<SkPaint>(L, 5));
     }
     return 0;
 }