commit 51e15a69ce5bef01ff0d0b5ae3d72c1b2ad3f799
author Ben Wagner <bungeman@google.com> Tue May 07 15:38:46 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue May 07 20:54:16 2019 +0000
tree 9c9b08eb4c3f06c108fb8c3d84ba83b48bf96b9b
parent 354ecf36930037b0120b16e67524f952f102eecf

Use SkTextEncoding enum instead of macros.

Change-Id: I4b6259590fa0693ee0522b4999a1c0fe250b173d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212504
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

gm/skbug_5321.cpp

diff --git a/gm/skbug_5321.cpp b/gm/skbug_5321.cpp
index 3ad71af..e389cbc 100644
--- a/gm/skbug_5321.cpp
+++ b/gm/skbug_5321.cpp
@@ -26,14 +26,14 @@
     SkScalar x = 20, y = 45;
 
     size_t byteLength = strlen(text);
-    canvas->drawSimpleText(text, byteLength, kUTF8_SkTextEncoding, x, y, font, SkPaint());
+    canvas->drawSimpleText(text, byteLength, SkTextEncoding::kUTF8, x, y, font, SkPaint());
 
     y += font.getMetrics(nullptr);
-    int glyph_count = font.countText(text, byteLength, kUTF8_SkTextEncoding);
+    int glyph_count = font.countText(text, byteLength, SkTextEncoding::kUTF8);
     SkTextBlobBuilder builder;
 
     auto rec = builder.allocRunPosH(font, glyph_count, y);
-    font.textToGlyphs(text, byteLength, kUTF8_SkTextEncoding, rec.glyphs, glyph_count);
+    font.textToGlyphs(text, byteLength, SkTextEncoding::kUTF8, rec.glyphs, glyph_count);
 
     font.getWidths(rec.glyphs, glyph_count, rec.pos);
     for (int i = 0; i < glyph_count; ++i) {