gm: use DEF_GM macro consistantly

Change-Id: I705180db106ec4515aaec5f347199b98b21976fa
Reviewed-on: https://skia-review.googlesource.com/c/186081
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

gm/aarectmodes.cpp

@@ -171,7 +171,5 @@ namespace skiagm {
 
 //////////////////////////////////////////////////////////////////////////////
 
-    static GM* MyFactory(void*) { return new AARectModesGM; }
-    static GMRegistry reg(MyFactory);
-
+    DEF_GM( return new AARectModesGM; );
 }

gm/bitmapcopy.cpp

@@ -130,6 +130,5 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new BitmapCopyGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new BitmapCopyGM; )
 }

gm/bitmapimage.cpp

@@ -72,7 +72,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new BitmapImageGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new BitmapImageGM; )
 
 }

gm/bitmapshader.cpp

@@ -138,7 +138,6 @@ DEF_SIMPLE_GM(hugebitmapshader, canvas, 100, 100) {
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new BitmapShaderGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new BitmapShaderGM; )
 
 }

gm/circles.cpp

@@ -200,7 +200,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new CircleGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new CircleGM; )
 
 }

gm/coloremoji_blendmodes.cpp

@@ -171,7 +171,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ColorEmojiBlendModesGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ColorEmojiBlendModesGM; )
 
 }

gm/convexpaths.cpp

@@ -292,7 +292,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ConvexPathsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ConvexPathsGM; )
 
 }

gm/copyTo4444.cpp

@@ -50,8 +50,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new CopyTo4444GM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new CopyTo4444GM; )
 
 }
 

gm/degeneratesegments.cpp

@@ -367,7 +367,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new DegenerateSegmentsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new DegenerateSegmentsGM; )
 
 }

gm/distantclip.cpp

@@ -67,7 +67,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new DistantClipGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new DistantClipGM; )
 
 }

gm/dstreadshuffle.cpp

@@ -182,7 +182,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new DstReadShuffle; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new DstReadShuffle; )
 
 }

gm/extractbitmap.cpp

@@ -78,7 +78,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ExtractBitmapGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ExtractBitmapGM; )
 
 }

gm/filltypes.cpp

@@ -90,7 +90,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new FillTypeGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new FillTypeGM; )
 
 }

gm/filltypespersp.cpp

@@ -125,7 +125,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new FillTypePerspGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new FillTypePerspGM; )
 
 }

gm/fontscaler.cpp

@@ -76,7 +76,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new FontScalerGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new FontScalerGM; )
 
 }

gm/fontscalerdistortable.cpp

@@ -96,7 +96,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new FontScalerDistortableGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new FontScalerDistortableGM; )
 
 }

gm/gradientDirtyLaundry.cpp

@@ -95,5 +95,4 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new GradientsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new GradientsGM; )

gm/gradtext.cpp

@@ -97,11 +97,8 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* CMyFactory(void*) { return new ChromeGradTextGM1; }
-static GM* CMyFactory2(void*) { return new ChromeGradTextGM2; }
-
-static GMRegistry Creg(CMyFactory);
-static GMRegistry Creg2(CMyFactory2);
+DEF_GM( return new ChromeGradTextGM1; )
+DEF_GM( return new ChromeGradTextGM2; )
 }
 
 DEF_SIMPLE_GM(gradtext, canvas, 500, 480) {

gm/hairlines.cpp

@@ -258,7 +258,6 @@ DEF_SIMPLE_GM(squarehair, canvas, 240, 360) {
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new HairlinesGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new HairlinesGM; )
 
 }

gm/hairmodes.cpp

@@ -120,7 +120,5 @@ namespace skiagm {
 
     //////////////////////////////////////////////////////////////////////////////
 
-    static GM* MyFactory(void*) { return new HairModesGM; }
-    static GMRegistry reg(MyFactory);
-
+    DEF_GM( return new HairModesGM; )
 }

gm/internal_links.cpp

@@ -70,7 +70,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new InternalLinksGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new InternalLinksGM; )
 
 }

gm/modecolorfilters.cpp

@@ -153,7 +153,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ModeColorFilterGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ModeColorFilterGM; )
 
 }

gm/ovals.cpp

@@ -299,7 +299,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new OvalGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new OvalGM; )
 
 }

gm/patheffects.cpp

@@ -160,8 +160,7 @@ private:
     typedef GM INHERITED;
 };
 
-static GM* PathEffectFactory(void*) { return new PathEffectGM; }
-static GMRegistry regPathEffect(PathEffectFactory);
+DEF_GM( return new PathEffectGM; )
 
 }
 

gm/pathopsinverse.cpp

@@ -109,7 +109,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new PathOpsInverseGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new PathOpsInverseGM; )
 
 }

gm/pathopsskpclip.cpp

@@ -66,7 +66,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new PathOpsSkpClipGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new PathOpsSkpClipGM; )
 
 }

gm/points.cpp

@@ -67,7 +67,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new PointsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new PointsGM; )
 
 }

gm/quadpaths.cpp

@@ -276,10 +276,8 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* QuadPathFactory(void*) { return new QuadPathGM; }
-static GMRegistry regQuadPath(QuadPathFactory);
+DEF_GM( return new QuadPathGM; )
 
-static GM* QuadClosePathFactory(void*) { return new QuadClosePathGM; }
-static GMRegistry regQuadClosePath(QuadClosePathFactory);
+DEF_GM( return new QuadClosePathGM; )
 
 }

gm/rects.cpp

@@ -279,7 +279,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new RectsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new RectsGM; )
 
 }

gm/roundrects.cpp

@@ -373,7 +373,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new RoundRectGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new RoundRectGM; )
 
 }

gm/samplerstress.cpp

@@ -139,7 +139,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new SamplerStressGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new SamplerStressGM; )
 
 }

gm/shadertext3.cpp

@@ -126,6 +126,5 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ShaderText3GM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ShaderText3GM; )
 }

gm/shadows.cpp

@@ -125,7 +125,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ShadowsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ShadowsGM; )
 
 }

gm/stlouisarch.cpp

@@ -92,7 +92,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new StLouisArchGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new StLouisArchGM; )
 
 }

gm/strokerects.cpp

@@ -77,7 +77,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new StrokeRectsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new StrokeRectsGM; )
 
 }

gm/thinrects.cpp

@@ -117,7 +117,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ThinRectsGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new ThinRectsGM; )
 
 }

gm/tinybitmap.cpp

@@ -48,7 +48,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new TinyBitmapGM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new TinyBitmapGM; )
 
 }

gm/xfermodes2.cpp

@@ -140,7 +140,6 @@ private:
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new Xfermodes2GM; }
-static GMRegistry reg(MyFactory);
+DEF_GM( return new Xfermodes2GM; )
 
 }