aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/bitmaprect.cpp
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2015-12-10 13:31:59 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-10 13:31:59 -0800
commit96f16e835e32665ea5af605e52715dbf43367291 (patch)
tree4ec1d4b16fad352a3f548d330ad099fde196e3e4 /gm/bitmaprect.cpp
parent4e56772432825e174b8f9a3370235381482a8f51 (diff)
Use DEF_GM everywhere
Diffstat (limited to 'gm/bitmaprect.cpp')
-rw-r--r--gm/bitmaprect.cpp21
1 files changed, 5 insertions, 16 deletions
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 077f0ee273..f855ad77c4 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -273,23 +273,12 @@ DEF_GM( return new BitmapRectRounding; )
//////////////////////////////////////////////////////////////////////////////
-static skiagm::GM* MyFactory0(void*) { return new DrawBitmapRect2(false); }
-static skiagm::GM* MyFactory1(void*) { return new DrawBitmapRect2(true); }
-
-static skiagm::GM* MyFactory2(void*) { return new DrawBitmapRect3(); }
-
-#ifndef SK_BUILD_FOR_ANDROID
-static skiagm::GM* MyFactory3(void*) { return new DrawBitmapRect4(false); }
-static skiagm::GM* MyFactory4(void*) { return new DrawBitmapRect4(true); }
-#endif
-
-static skiagm::GMRegistry reg0(MyFactory0);
-static skiagm::GMRegistry reg1(MyFactory1);
-
-static skiagm::GMRegistry reg2(MyFactory2);
+DEF_GM( return new DrawBitmapRect2(false); )
+DEF_GM( return new DrawBitmapRect2(true); )
+DEF_GM( return new DrawBitmapRect3(); )
#ifndef SK_BUILD_FOR_ANDROID
-static skiagm::GMRegistry reg3(MyFactory3);
-static skiagm::GMRegistry reg4(MyFactory4);
+DEF_GM( return new DrawBitmapRect4(false); )
+DEF_GM( return new DrawBitmapRect4(true); )
#endif