Switch a bunch of tests to use DEF_SIMPLE_GM.
Should be no user- or test-visible changes.
BUG=skia:
Change-Id: I6499dc978a41fee344b847c118f84227271561c5
Reviewed-on: https://skia-review.googlesource.com/6906
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Stephan White <senorblanco@chromium.org>
diff --git a/gm/localmatriximagefilter.cpp b/gm/localmatriximagefilter.cpp
index d5b7e3e..14bbd32 100644
--- a/gm/localmatriximagefilter.cpp
+++ b/gm/localmatriximagefilter.cpp
@@ -28,6 +28,18 @@
return surface->makeImageSnapshot();
}
+static void show_image(SkCanvas* canvas, SkImage* image, sk_sp<SkImageFilter> filter) {
+ SkPaint paint;
+ paint.setStyle(SkPaint::kStroke_Style);
+ SkRect r = SkRect::MakeIWH(image->width(), image->height()).makeOutset(SK_ScalarHalf,
+ SK_ScalarHalf);
+ canvas->drawRect(r, paint);
+
+ paint.setStyle(SkPaint::kFill_Style);
+ paint.setImageFilter(filter);
+ canvas->drawImage(image, 0, 0, &paint);
+}
+
typedef sk_sp<SkImageFilter> (*ImageFilterFactory)();
// +[]{...} did not work on windows (VS)
@@ -36,66 +48,36 @@
template <typename T> ImageFilterFactory IFCCast(T arg) { return arg; }
// Show the effect of localmatriximagefilter with various matrices, on various filters
-class LocalMatrixImageFilterGM : public skiagm::GM {
-public:
- LocalMatrixImageFilterGM() {}
+DEF_SIMPLE_GM(localmatriximagefilter, canvas, 640, 640) {
+ sk_sp<SkImage> image0(make_image(canvas));
-protected:
- SkString onShortName() override {
- return SkString("localmatriximagefilter");
- }
+ const ImageFilterFactory factories[] = {
+ IFCCast([]{ return SkBlurImageFilter::Make(8, 8, nullptr); }),
+ IFCCast([]{ return SkDilateImageFilter::Make(8, 8, nullptr); }),
+ IFCCast([]{ return SkErodeImageFilter::Make(8, 8, nullptr); }),
+ IFCCast([]{ return SkOffsetImageFilter::Make(8, 8, nullptr); }),
+ };
- SkISize onISize() override {
- return SkISize::Make(640, 640);
- }
+ const SkMatrix matrices[] = {
+ SkMatrix::MakeScale(SK_ScalarHalf, SK_ScalarHalf),
+ SkMatrix::MakeScale(2, 2),
+ SkMatrix::MakeTrans(10, 10)
+ };
- static void show_image(SkCanvas* canvas, SkImage* image, sk_sp<SkImageFilter> filter) {
- SkPaint paint;
- paint.setStyle(SkPaint::kStroke_Style);
- SkRect r = SkRect::MakeIWH(image->width(), image->height()).makeOutset(SK_ScalarHalf,
- SK_ScalarHalf);
- canvas->drawRect(r, paint);
+ const SkScalar spacer = image0->width() * 3.0f / 2;
- paint.setStyle(SkPaint::kFill_Style);
- paint.setImageFilter(filter);
- canvas->drawImage(image, 0, 0, &paint);
- }
+ canvas->translate(40, 40);
+ for (auto&& factory : factories) {
+ sk_sp<SkImageFilter> filter(factory());
- void onDraw(SkCanvas* canvas) override {
- sk_sp<SkImage> image0(make_image(canvas));
-
- const ImageFilterFactory factories[] = {
- IFCCast([]{ return SkBlurImageFilter::Make(8, 8, nullptr); }),
- IFCCast([]{ return SkDilateImageFilter::Make(8, 8, nullptr); }),
- IFCCast([]{ return SkErodeImageFilter::Make(8, 8, nullptr); }),
- IFCCast([]{ return SkOffsetImageFilter::Make(8, 8, nullptr); }),
- };
-
- const SkMatrix matrices[] = {
- SkMatrix::MakeScale(SK_ScalarHalf, SK_ScalarHalf),
- SkMatrix::MakeScale(2, 2),
- SkMatrix::MakeTrans(10, 10)
- };
-
- const SkScalar spacer = image0->width() * 3.0f / 2;
-
- canvas->translate(40, 40);
- for (auto&& factory : factories) {
- sk_sp<SkImageFilter> filter(factory());
-
- canvas->save();
- show_image(canvas, image0.get(), filter);
- for (const auto& matrix : matrices) {
- sk_sp<SkImageFilter> localFilter(filter->makeWithLocalMatrix(matrix));
- canvas->translate(spacer, 0);
- show_image(canvas, image0.get(), std::move(localFilter));
- }
- canvas->restore();
- canvas->translate(0, spacer);
+ canvas->save();
+ show_image(canvas, image0.get(), filter);
+ for (const auto& matrix : matrices) {
+ sk_sp<SkImageFilter> localFilter(filter->makeWithLocalMatrix(matrix));
+ canvas->translate(spacer, 0);
+ show_image(canvas, image0.get(), std::move(localFilter));
}
+ canvas->restore();
+ canvas->translate(0, spacer);
}
-
-private:
- typedef GM INHERITED;
-};
-DEF_GM( return new LocalMatrixImageFilterGM; )
+}