commit 6cc65e1fdaa5c86ddec45feb9b9415c9a9330a1a
author Hal Canary <halcanary@google.com> Wed Jul 03 15:53:04 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 08 19:09:42 2019 +0000
tree 321d213fc70195baaf38d63ab357311ba57a5d1e
parent d09064263d4fdbdd37800542ca891b104a814c13

Samples: simplify Sample::Event

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

samplecode/SampleClipDrawMatch.cpp

diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp
index e57c338..729e16a 100644
--- a/samplecode/SampleClipDrawMatch.cpp
+++ b/samplecode/SampleClipDrawMatch.cpp
@@ -135,9 +135,7 @@
 protected:
     SkString name() override { return SkString("ClipDrawMatch"); }
 
-    bool onQuery(Sample::Event* evt) override {
-        SkUnichar uni;
-        if (Sample::CharQ(*evt, &uni)) {
+    bool onChar(SkUnichar uni) override {
             switch (uni) {
                 case '1': fGeom = kRect_Geometry; return true;
                 case '2': fGeom = kRRect_Geometry; return true;
@@ -152,8 +150,7 @@
                 case 't': fClipFirst = !fClipFirst; return true;
                 default: break;
             }
-        }
-        return this->INHERITED::onQuery(evt);
+            return false;
     }
 
     void drawClippedGeom(SkCanvas* canvas, const SkPoint& offset, bool useAA) {