commit 3a42ec0ee7937d88bb087b98c1b536fb7cbd77c6
author Mike Reed <reed@google.com> Tue Oct 30 12:53:21 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 30 17:26:47 2018 +0000
tree 66c3bb4ac4b9657874042b95040268e54d2ab990
parent f5973509ec681e3cc6d498dc31e549c6285e4a61

hide the SkPaint::Align enum entirely

Bug: skia:2664
Change-Id: I080b015dbcb3a3cd73bb6847f3243a996d5f7b7d
Reviewed-on: https://skia-review.googlesource.com/c/166282
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

src/utils/SkTextUtils.cpp

diff --git a/src/utils/SkTextUtils.cpp b/src/utils/SkTextUtils.cpp
index 784cf7d..cc1b48e 100644
--- a/src/utils/SkTextUtils.cpp
+++ b/src/utils/SkTextUtils.cpp
@@ -8,7 +8,7 @@
 #include "SkTextUtils.h"
 
 void SkTextUtils::DrawText(SkCanvas* canvas, const void* text, size_t size, SkScalar x, SkScalar y,
-                            const SkPaint& origPaint, SkPaint::Align align) {
+                            const SkPaint& origPaint, Align align) {
     int count = origPaint.countText(text, size);
     if (!count) {
         return;
@@ -31,12 +31,12 @@
     SkScalar* widths = widthStorage.get();
     paint.getTextWidths(glyphs, count * sizeof(uint16_t), widths);
 
-    if (align != SkPaint::kLeft_Align) {
+    if (align != kLeft_Align) {
         SkScalar offset = 0;
         for (int i = 0; i < count; ++i) {
             offset += widths[i];
         }
-        if (align == SkPaint::kCenter_Align) {
+        if (align == kCenter_Align) {
             offset *= 0.5f;
         }
         x -= offset;