commit 8a027312cd98bab13f33b0b0c8c91aec0b9ae40d
author Hal Canary <halcanary@google.com> Wed Jul 03 10:55:44 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 03 17:41:16 2019 +0000
tree 9a333073db99be07055ac7486148463c89c68b0f
parent 1e371e548e3e5a0af7aca9fa4549a8c55b5191c0

Samples: add name() virtual

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

samplecode/SampleChineseFling.cpp

diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp
index e9631f2..b250da4 100644
--- a/samplecode/SampleChineseFling.cpp
+++ b/samplecode/SampleChineseFling.cpp
@@ -42,13 +42,7 @@
     ChineseFlingView() : fBlobs(kNumBlobs) {}
 
 protected:
-    bool onQuery(Sample::Event* evt) override {
-        if (Sample::TitleQ(*evt)) {
-            Sample::TitleR(evt, "chinese-fling");
-            return true;
-        }
-        return this->INHERITED::onQuery(evt);
-    }
+    SkString name() override { return SkString("chinese-fling"); }
 
     void onDrawContent(SkCanvas* canvas) override {
         if (!fInitialized) {
@@ -128,11 +122,9 @@
     ChineseZoomView() : fBlobs(kNumBlobs), fScale(15.0f), fTranslate(0.0f) {}
 
 protected:
+    SkString name() override { return SkString("chinese-zoom"); }
+
     bool onQuery(Sample::Event* evt) override {
-        if (Sample::TitleQ(*evt)) {
-            Sample::TitleR(evt, "chinese-zoom");
-            return true;
-        }
         SkUnichar uni;
         if (Sample::CharQ(*evt, &uni)) {
             if ('>' == uni) {