Make SkAtlasTextTarget use glyph IDs

Bug: skia:
Change-Id: Idefd69f02f62fea22c41a3476676773221c3ae81
Reviewed-on: https://skia-review.googlesource.com/73700
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp
index a25bb875b3..8270306e5e 100644
--- a/gm/atlastext.cpp
+++ b/gm/atlastext.cpp
@@ -15,6 +15,7 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkTypeface.h"
+#include "SkUtils.h"
 #include "gpu/TestContext.h"
 #include "gpu/atlastext/GLTestAtlasTextRenderer.h"
 #include "gpu/atlastext/TestAtlasTextRenderer.h"
@@ -24,10 +25,18 @@
 
 static SkScalar draw_string(SkAtlasTextTarget* target, const SkString& text, SkScalar x, SkScalar y,
                             uint32_t color, sk_sp<SkTypeface> typeface, float size) {
-    auto font = SkAtlasTextFont::Make(std::move(typeface), size);
-    target->drawText(text.c_str(), text.size(), x, y, color, *font);
+    auto font = SkAtlasTextFont::Make(typeface, size);
+    int cnt = SkUTF8_CountUnichars(text.c_str());
+    std::unique_ptr<SkGlyphID[]> glyphs(new SkGlyphID[cnt]);
+    typeface->charsToGlyphs(text.c_str(), SkTypeface::Encoding::kUTF8_Encoding, glyphs.get(), cnt);
+
+    target->drawText(glyphs.get(), cnt, x, y, color, *font);
+
+    // Using a paint just to perform a measure to let the caller know how much space to skip in x.
     SkPaint paint;
     paint.setTextSize(size);
+    paint.setTypeface(std::move(typeface));
+    paint.setTextEncoding(SkPaint::kUTF8_TextEncoding);
     return x + paint.measureText(text.c_str(), text.size());
 }