commit 9edbf42e75cb46124ba6410302c93f44c761311d
author Mike Reed <reed@google.com> Wed Nov 07 19:54:33 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 08 16:33:04 2018 +0000
tree 32fc15b16637d64394bce09356e7749adeaef8d6
parent 7d8f82b9b0db075f9f0f9ce55638796cd23edf63

Revert[4] "hide nested hinting enum"

This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207.

Bug: skia:
Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6
Reviewed-on: https://skia-review.googlesource.com/c/169520
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

tools/debugger/SkDrawCommand.cpp

diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index be506e7..229cd49 100644
--- a/tools/debugger/SkDrawCommand.cpp
+++ b/tools/debugger/SkDrawCommand.cpp
@@ -791,19 +791,19 @@
 }
 
 static void apply_paint_hinting(const SkPaint& paint, Json::Value* target) {
-    SkPaint::Hinting hinting = paint.getHinting();
+    SkFontHinting hinting = (SkFontHinting)paint.getHinting();
     if (hinting != SkPaintDefaults_Hinting) {
         switch (hinting) {
-            case SkPaint::kNo_Hinting:
+            case kNo_SkFontHinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_NONE;
                 break;
-            case SkPaint::kSlight_Hinting:
+            case kSlight_SkFontHinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_SLIGHT;
                 break;
-            case SkPaint::kNormal_Hinting:
+            case kNormal_SkFontHinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_NORMAL;
                 break;
-            case SkPaint::kFull_Hinting:
+            case kFull_SkFontHinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_FULL;
                 break;
         }