commit 3a85ed12bfbaa92a185af0bc54478b837ab95bc0
author Hal Canary <halcanary@google.com> Mon Jul 08 16:07:57 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 09 16:16:41 2019 +0000
tree 9f0bd210c5743e2791999c334e25138fde18143b
parent 489cf8888c3c890ad198da8a002e417078f292b4

ModifierKey unifies sk_app::Window::ModifierKey & Sample::Click::ModifierKey

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

samplecode/Sample.cpp

diff --git a/samplecode/Sample.cpp b/samplecode/Sample.cpp
index 9ee3b84..67d9da0 100644
--- a/samplecode/Sample.cpp
+++ b/samplecode/Sample.cpp
@@ -68,7 +68,7 @@
 
 Sample::Click::~Click() {}
 
-Sample::Click* Sample::findClickHandler(SkScalar x, SkScalar y, unsigned modi) {
+Sample::Click* Sample::findClickHandler(SkScalar x, SkScalar y, ModifierKey modi) {
     if (x < 0 || y < 0 || x >= fWidth || y >= fHeight) {
         return nullptr;
     }
@@ -76,7 +76,7 @@
     return this->onFindClickHandler(x, y, modi);
 }
 
-void Sample::DoClickDown(Click* click, int x, int y, unsigned modi) {
+void Sample::DoClickDown(Click* click, int x, int y, ModifierKey modi) {
     SkASSERT(click);
 
     Sample* target = click->fTarget.get();
@@ -95,7 +95,7 @@
     target->onClick(click);
 }
 
-void Sample::DoClickMoved(Click* click, int x, int y, unsigned modi) {
+void Sample::DoClickMoved(Click* click, int x, int y, ModifierKey modi) {
     SkASSERT(click);
 
     Sample* target = click->fTarget.get();
@@ -114,7 +114,7 @@
     target->onClick(click);
 }
 
-void Sample::DoClickUp(Click* click, int x, int y, unsigned modi) {
+void Sample::DoClickUp(Click* click, int x, int y, ModifierKey modi) {
     SkASSERT(click);
 
     Sample* target = click->fTarget.get();
@@ -137,7 +137,7 @@
 
 void Sample::onSizeChange() {}
 
-Sample::Click* Sample::onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) {
+Sample::Click* Sample::onFindClickHandler(SkScalar x, SkScalar y, ModifierKey modi) {
     return nullptr;
 }