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>

samplecode/Sample.h

diff --git a/samplecode/Sample.h b/samplecode/Sample.h
index 390ac4c..390cb78 100644
--- a/samplecode/Sample.h
+++ b/samplecode/Sample.h
@@ -14,6 +14,7 @@
 #include "include/core/SkString.h"
 #include "include/private/SkMacros.h"
 #include "src/utils/SkMetaData.h"
+#include "tools/InputState.h"
 #include "tools/ModifierKey.h"
 #include "tools/Registry.h"
 
@@ -52,8 +53,6 @@
     virtual bool onChar(SkUnichar) { return false; }
 
     // Click handling
-    // TODO: unify Sample::InputState and sk_app::Window::InputState
-    enum class InputState { kDown, kUp, kMove };
     class Click {
     public:
         virtual ~Click() = default;