commit 594fe855a36091b41667106d867be07217cb6699
author Hal Canary <halcanary@google.com> Thu Jul 18 13:35:49 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 24 18:05:45 2019 +0000
tree 206f44819771153b9a8083ca42cee4372be9495c
parent bbb3f646f8509482f56d93a66700a34d2fb2083f

gm: simplify several onName

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

gm/tilemodes_scaled.cpp

diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index 2b41a1d..88d8c8b 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -194,17 +194,12 @@
 
 class ScaledTiling2GM : public skiagm::GM {
     ShaderProc fProc;
-    SkString   fName;
+    const char* fName;
 public:
-    ScaledTiling2GM(ShaderProc proc, const char name[]) : fProc(proc) {
-        fName.printf("scaled_tilemode_%s", name);
-    }
+    ScaledTiling2GM(ShaderProc proc, const char name[]) : fProc(proc), fName(name) {}
 
-protected:
-
-    SkString onShortName() override {
-        return fName;
-    }
+private:
+    SkString onShortName() override { return SkString(fName); }
 
     SkISize onISize() override { return SkISize::Make(650, 610); }
 
@@ -257,14 +252,11 @@
             y += r.height() * 4 / 3;
         }
     }
-
-private:
-    typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ScaledTilingGM(true); )
 DEF_GM( return new ScaledTilingGM(false); )
-DEF_GM( return new ScaledTiling2GM(make_bm, "bitmap"); )
-DEF_GM( return new ScaledTiling2GM(make_grad, "gradient"); )
+DEF_GM( return new ScaledTiling2GM(make_bm, "scaled_tilemode_bitmap"); )
+DEF_GM( return new ScaledTiling2GM(make_grad, "scaled_tilemode_gradient"); )