Index: gm/strokes.cpp |
diff --git a/gm/strokes.cpp b/gm/strokes.cpp |
index 303d4a538bfcd117f0cd364aa81f221f298ee528..f2abb0b7dd6d54d82fc880973810471873a54318 100644 |
--- a/gm/strokes.cpp |
+++ b/gm/strokes.cpp |
@@ -483,17 +483,11 @@ private: |
////////////////////////////////////////////////////////////////////////////// |
-static skiagm::GM* F0(void*) { return new StrokesGM; } |
-static skiagm::GM* F1(void*) { return new Strokes2GM; } |
-static skiagm::GM* F2(void*) { return new Strokes3GM; } |
-static skiagm::GM* F3(void*) { return new Strokes4GM; } |
-static skiagm::GM* F4(void*) { return new Strokes5GM; } |
- |
-static skiagm::GMRegistry R0(F0); |
-static skiagm::GMRegistry R1(F1); |
-static skiagm::GMRegistry R2(F2); |
-static skiagm::GMRegistry R3(F3); |
-static skiagm::GMRegistry R4(F4); |
+DEF_GM( return new StrokesGM; ) |
+DEF_GM( return new Strokes2GM; ) |
+DEF_GM( return new Strokes3GM; ) |
+DEF_GM( return new Strokes4GM; ) |
+DEF_GM( return new Strokes5GM; ) |
DEF_GM( return new ZeroLenStrokesGM; ) |
DEF_GM( return new TeenyStrokesGM; ) |