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/SampleSlide.cpp

diff --git a/tools/viewer/SampleSlide.cpp b/tools/viewer/SampleSlide.cpp
index 1710915..df0ad3e 100644
--- a/tools/viewer/SampleSlide.cpp
+++ b/tools/viewer/SampleSlide.cpp
@@ -44,10 +44,6 @@
     return fSample && fSample->onChar(c);
 }
 
-bool SampleSlide::onMouse(SkScalar x, SkScalar y, Window::InputState state,
-                          ModifierKey modifierKeys) {
-    static_assert((Sample::InputState)Window::kDown_InputState == Sample::InputState::kDown, "");
-    static_assert((Sample::InputState)Window::kUp_InputState   == Sample::InputState::kUp,   "");
-    static_assert((Sample::InputState)Window::kMove_InputState == Sample::InputState::kMove, "");
-    return fSample && fSample->mouse({x, y}, (Sample::InputState)state, modifierKeys);
+bool SampleSlide::onMouse(SkScalar x, SkScalar y, InputState state, ModifierKey modifierKeys) {
+    return fSample && fSample->mouse({x, y}, state, modifierKeys);
 }