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

diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index fdbda8b..ba0a939 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -160,7 +160,7 @@
         canvas->restore();
     }
 
-    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, ModifierKey) override {
+    Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, skui::ModifierKey) override {
         // Check mode buttons first
         for (int i = 0; i < N_Modes; ++i) {
             if (fModeButtons[i].hitTest(x, y)) {
@@ -182,7 +182,7 @@
     bool onClick(Click* click) override {
         int32_t mode;
         if (click->fMeta.findS32("mode", &mode)) {
-            if (fSelected && InputState::kUp == click->fState) {
+            if (fSelected && skui::InputState::kUp == click->fState) {
                 fSelected->fMode = gModes[mode];
             }
         } else {