commit ff2e8fe65f5610a846c69ef5fb12a3fba524dce1
author Hal Canary <halcanary@google.com> Tue Jul 16 09:58:43 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 16 14:51:03 2019 +0000
tree 8d683d9e72586dcc78cb3d4262f9ee8014914ce3
parent c714ce0e7a613cb8cf3ae5feabb5f1630c32ccf8

sk_app, Sample: Unify InputState enum.

    replace() {
      if git grep -q "$1")";
      then sed -i -e "s#${1}#${2}#g" $(git grep -l "$1");
      fi
    }
    replace 'k\([A-Za-z]*\)_InputState' 'InputState::k\1'
    replace '\(\(sk_app::\|\)Window\|Sample\|\)::InputState' 'InputState'

Change-Id: I4cc18814fb1fbdd1f240aabba05aae79c54a4841
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227642
Commit-Queue: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

tools/viewer/SlideDir.cpp

diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp
index 5c1aa37..cdfed78 100644
--- a/tools/viewer/SlideDir.cpp
+++ b/tools/viewer/SlideDir.cpp
@@ -158,7 +158,7 @@
         fState = State::kUnfocusing;
     }
 
-    bool onMouse(SkScalar x, SkScalar y, sk_app::Window::InputState state, ModifierKey modifiers) {
+    bool onMouse(SkScalar x, SkScalar y, InputState state, ModifierKey modifiers) {
         SkASSERT(fTarget);
 
         if (!fRect.contains(x, y)) {
@@ -379,9 +379,9 @@
     return false;
 }
 
-bool SlideDir::onMouse(SkScalar x, SkScalar y, sk_app::Window::InputState state,
+bool SlideDir::onMouse(SkScalar x, SkScalar y, InputState state,
                        ModifierKey modifiers) {
-    if (state == sk_app::Window::kMove_InputState || ModifierKeyIsSet(modifiers))
+    if (state == InputState::kMove || ModifierKeyIsSet(modifiers))
         return false;
 
     if (fFocusController->hasFocus()) {
@@ -395,11 +395,11 @@
     static constexpr SkScalar kClickMoveTolerance = 4;
 
     switch (state) {
-    case sk_app::Window::kDown_InputState:
+    case InputState::kDown:
         fTrackingCell = cell;
         fTrackingPos = SkPoint::Make(x, y);
         break;
-    case sk_app::Window::kUp_InputState:
+    case InputState::kUp:
         if (cell == fTrackingCell &&
             SkPoint::Distance(fTrackingPos, SkPoint::Make(x, y)) < kClickMoveTolerance) {
             fFocusController->startFocus(cell);