commit 6bd19df9fa9d26d9de4de646b2cdf82ff5dca67c
author Mike Reed <reed@google.com> Wed Nov 07 22:05:54 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 07 22:06:01 2018 +0000
tree afb1ea511db884d388a47216431c4f51472f6643
parent 607b0a78c115e4da74f2549da0f9267b349df4ef

Revert "hide nested hinting enum"

This reverts commit fbebecee0eb99338e1b08422842aba6ab724e243.

Reason for revert: need staging guard for flutter

Original change's description:
> hide nested hinting enum
> 
> Bug: skia:2664
> Bug: skia:8527
> Change-Id: I8f4b832d5524fb792bcc608d6bd515229881b048
> Reviewed-on: https://skia-review.googlesource.com/c/168270
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>

TBR=fmalita@chromium.org,reed@google.com

Change-Id: I19496daa059932574f36ac47061068a81d5524c3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:2664, skia:8527
Reviewed-on: https://skia-review.googlesource.com/c/169344
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 0ced76a..bf779e9 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -359,20 +359,20 @@
     fCommands.addCommand('H', "Paint", "Hinting mode", [this]() {
         if (!fPaintOverrides.fHinting) {
             fPaintOverrides.fHinting = true;
-            fPaint.setHinting(kNo_SkFontHinting);
+            fPaint.setHinting(SkPaint::kNo_Hinting);
         } else {
-            switch ((SkFontHinting)fPaint.getHinting()) {
-                case kNo_SkFontHinting:
-                    fPaint.setHinting(kSlight_SkFontHinting);
+            switch (fPaint.getHinting()) {
+                case SkPaint::kNo_Hinting:
+                    fPaint.setHinting(SkPaint::kSlight_Hinting);
                     break;
-                case kSlight_SkFontHinting:
-                    fPaint.setHinting(kNormal_SkFontHinting);
+                case SkPaint::kSlight_Hinting:
+                    fPaint.setHinting(SkPaint::kNormal_Hinting);
                     break;
-                case kNormal_SkFontHinting:
-                    fPaint.setHinting(kFull_SkFontHinting);
+                case SkPaint::kNormal_Hinting:
+                    fPaint.setHinting(SkPaint::kFull_Hinting);
                     break;
-                case kFull_SkFontHinting:
-                    fPaint.setHinting(kNo_SkFontHinting);
+                case SkPaint::kFull_Hinting:
+                    fPaint.setHinting(SkPaint::kNo_Hinting);
                     fPaintOverrides.fHinting = false;
                     break;
             }
@@ -710,17 +710,17 @@
               "Force Autohint", "No Force Autohint");
 
     if (fPaintOverrides.fHinting) {
-        switch ((SkFontHinting)fPaint.getHinting()) {
-            case kNo_SkFontHinting:
+        switch (fPaint.getHinting()) {
+            case SkPaint::kNo_Hinting:
                 paintTitle.append("No Hinting");
                 break;
-            case kSlight_SkFontHinting:
+            case SkPaint::kSlight_Hinting:
                 paintTitle.append("Slight Hinting");
                 break;
-            case kNormal_SkFontHinting:
+            case SkPaint::kNormal_Hinting:
                 paintTitle.append("Normal Hinting");
                 break;
-            case kFull_SkFontHinting:
+            case SkPaint::kFull_Hinting:
                 paintTitle.append("Full Hinting");
                 break;
         }
@@ -1614,17 +1614,17 @@
             if (ImGui::CollapsingHeader("Paint")) {
                 int hintingIdx = 0;
                 if (fPaintOverrides.fHinting) {
-                    hintingIdx = static_cast<unsigned>(fPaint.getHinting()) + 1;
+                    hintingIdx = fPaint.getHinting() + 1;
                 }
                 if (ImGui::Combo("Hinting", &hintingIdx,
                                  "Default\0None\0Slight\0Normal\0Full\0\0"))
                 {
                     if (hintingIdx == 0) {
                         fPaintOverrides.fHinting = false;
-                        fPaint.setHinting(kNo_SkFontHinting);
+                        fPaint.setHinting(SkPaint::kNo_Hinting);
                     } else {
                         fPaintOverrides.fHinting = true;
-                        SkFontHinting hinting = SkTo<SkFontHinting>(hintingIdx - 1);
+                        SkPaint::Hinting hinting = SkTo<SkPaint::Hinting>(hintingIdx - 1);
                         fPaint.setHinting(hinting);
                     }
                     paramsChanged = true;