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/Viewer.h

diff --git a/tools/viewer/Viewer.h b/tools/viewer/Viewer.h
index a1b9910..1ebc927 100644
--- a/tools/viewer/Viewer.h
+++ b/tools/viewer/Viewer.h
@@ -37,10 +37,10 @@
     void onBackendCreated() override;
     void onPaint(SkSurface*) override;
     void onResize(int width, int height) override;
-    bool onTouch(intptr_t owner, sk_app::Window::InputState state, float x, float y) override;
-    bool onMouse(int x, int y, sk_app::Window::InputState state, ModifierKey modifiers) override;
+    bool onTouch(intptr_t owner, InputState state, float x, float y) override;
+    bool onMouse(int x, int y, InputState state, ModifierKey modifiers) override;
     void onUIStateChanged(const SkString& stateName, const SkString& stateValue) override;
-    bool onKey(sk_app::Window::Key key, sk_app::Window::InputState state, ModifierKey modifiers) override;
+    bool onKey(sk_app::Window::Key key, InputState state, ModifierKey modifiers) override;
     bool onChar(SkUnichar c, ModifierKey modifiers) override;
 
     struct SkFontFields {