commit 7e6e58b5c81c40b1e943ac58a37caa57576bf021
author Ben Wagner <bungeman@google.com> Tue May 21 17:37:49 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue May 21 17:37:49 2019 +0000
tree 0df664462fed0c6d53ca79637488c7f6907167a9
parent 5aadf25076b8893e31ac530d5b91cddd15f26ea4

[term][examples] Replace kUTF8_SkTextEncoding with SkTextEncoding::kUTF8

Replace the old macro names with the new enum values. This will allow
Skia to remove the old macros.

Change-Id: I0995691f8d5167da42fdcdee81b88dbadc4446a6

app/term/view_controller.cc

diff --git a/app/term/view_controller.cc b/app/term/view_controller.cc
index cab77fd..048c584 100644
--- a/app/term/view_controller.cc
+++ b/app/term/view_controller.cc
@@ -67,7 +67,7 @@
   // To figure out the advance width, measure an X. Better hope the font
   // is monospace.
   advance_width_ = static_cast<int>(
-      ceilf(fg_font.measureText("X", 1, kUTF8_SkTextEncoding)));
+      ceilf(fg_font.measureText("X", 1, SkTextEncoding::kUTF8)));
   FXL_DCHECK(advance_width_ > 0);
 }
 

examples/ui/jank/jank_view.cc

diff --git a/examples/ui/jank/jank_view.cc b/examples/ui/jank/jank_view.cc
index cef2cbd..36170cf 100644
--- a/examples/ui/jank/jank_view.cc
+++ b/examples/ui/jank/jank_view.cc
@@ -87,12 +87,13 @@
   SkFont textFont;
   textFont.setTypeface(typeface_);
   textFont.setSize(kTextSize);
-  textFont.measureText(label, strlen(label), kUTF8_SkTextEncoding, &textBounds);
+  textFont.measureText(label, strlen(label), SkTextEncoding::kUTF8,
+                       &textBounds);
 
   SkPaint textPaint;
   textPaint.setColor(SK_ColorBLACK);
   textPaint.setAntiAlias(true);
-  canvas->drawSimpleText(label, strlen(label), kUTF8_SkTextEncoding,
+  canvas->drawSimpleText(label, strlen(label), SkTextEncoding::kUTF8,
                          bounds.centerX() - textBounds.centerX(),
                          bounds.centerY() - textBounds.centerY(), textFont,
                          textPaint);