commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207
author Mike Klein <mtklein@google.com> Wed Nov 07 23:56:21 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 07 23:56:24 2018 +0000
tree 544c796f9feeab053bb97e4ef196622ac0dac427
parent c248c0542bc12b5b3187ef3ed07545cba2dbe4db

Reland "Revert "hide nested hinting enum""

This reverts commit f49563bf9276f70441fd22da83413d585b2bcc17.

Reason for revert: Google3 also.

Original change's description:
> Revert "Revert "hide nested hinting enum""
> 
> This reverts commit 6bd19df9fa9d26d9de4de646b2cdf82ff5dca67c.
> 
> Restores original CL, but adds guards for flutter.
> 
> Bug: skia:
> Change-Id: I380b4ea87d293355026d734249aa2b8c397da144
> Reviewed-on: https://skia-review.googlesource.com/c/169345
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
> Auto-Submit: Mike Reed <reed@google.com>

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

Change-Id: I26a07555df56ce92e86b114ecf4ab64643e71ed1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/169441
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

tools/debugger/SkDrawCommand.cpp

diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index 229cd49..be506e7 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) {
-    SkFontHinting hinting = (SkFontHinting)paint.getHinting();
+    SkPaint::Hinting hinting = paint.getHinting();
     if (hinting != SkPaintDefaults_Hinting) {
         switch (hinting) {
-            case kNo_SkFontHinting:
+            case SkPaint::kNo_Hinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_NONE;
                 break;
-            case kSlight_SkFontHinting:
+            case SkPaint::kSlight_Hinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_SLIGHT;
                 break;
-            case kNormal_SkFontHinting:
+            case SkPaint::kNormal_Hinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_NORMAL;
                 break;
-            case kFull_SkFontHinting:
+            case SkPaint::kFull_Hinting:
                 (*target)[SKDEBUGCANVAS_ATTRIBUTE_HINTING] = SKDEBUGCANVAS_HINTING_FULL;
                 break;
         }