commit b1f411ac053dca8e9ec3762708aed9840af56307
author Hal Canary <halcanary@google.com> Thu Aug 29 10:39:22 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 29 15:39:32 2019 +0000
tree 936b57bf1c0d822ab4d32d635dbc7e708665785b
parent ca8b07cf8a59f74ce959df49135940bec7bdc84e

tools/skui: put all enums in a common namespace

Change-Id: Icd331e8946d80652750b8b6ea0db65f5f676ac3e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/238058
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

samplecode/SamplePathClip.cpp

diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index 36c6268..c7852ab 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -52,7 +52,7 @@
         canvas->drawOval(oval, p);
     }
 
-    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
         return new Click();
     }
 
@@ -277,7 +277,7 @@
         return dx*dx + dy*dy <= rad*rad;
     }
 
-    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
         for (int i = 0; i < N; ++i) {
             if (hit_test(fPoly[i], x, y)) {
                 return new VertClick(&fPoly[i]);