Minor code cleanup (left over from prior CL)

gm/imagefiltersscaled.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkColor.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkGradientShader.h"
 #include "SkLightingImageFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkPerlinNoiseShader.h"
 #include "SkPoint3.h"
 #include "SkRectShaderImageFilter.h"
 #include "SkScalar.h"
 #include "gm.h"
 
 #define RESIZE_FACTOR SkIntToScalar(4)
 
 namespace skiagm {
 
 class ImageFiltersScaledGM : public GM {
 public:
-    ImageFiltersScaledGM() : fInitialized(false) {
+    ImageFiltersScaledGM() {
         this->setBGColor(0x00000000);
     }
 
 protected:
 
-    virtual SkString onShortName() {
+    SkString onShortName() override {
         return SkString("imagefiltersscaled");
     }
 
-    virtual SkISize onISize() {
+    SkISize onISize() override {
         return SkISize::Make(1428, 500);
     }
 
-    void make_gradient_circle(int width, int height) {
+    void makeGradientCircle(int width, int height) {
         SkScalar x = SkIntToScalar(width / 2);
         SkScalar y = SkIntToScalar(height / 2);
         SkScalar radius = SkScalarMul(SkMinScalar(x, y), SkIntToScalar(4) / SkIntToScalar(5));
         fGradientCircle.allocN32Pixels(width, height);
         SkCanvas canvas(fGradientCircle);
         canvas.clear(0x00000000);
         SkColor colors[2];
         colors[0] = SK_ColorWHITE;
         colors[1] = SK_ColorBLACK;
         SkAutoTUnref<SkShader> shader(
             SkGradientShader::CreateRadial(SkPoint::Make(x, y), radius, colors, nullptr, 2,
                                            SkShader::kClamp_TileMode)
         );
         SkPaint paint;
         paint.setShader(shader);
         canvas.drawCircle(x, y, radius, paint);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
-        if (!fInitialized) {
-            fCheckerboard.allocN32Pixels(64, 64);
-            SkCanvas checkerboardCanvas(fCheckerboard);
-            sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
+    void onOnceBeforeDraw() override {
+        fCheckerboard = sk_tool_utils::create_checkerboard_bitmap(64, 64,
+                                                                  0xFFA0A0A0, 0xFF404040, 8);
+        this->makeGradientCircle(64, 64);
+    }
 
-            this->make_gradient_circle(64, 64);
-            fInitialized = true;
-        }
+    void onDraw(SkCanvas* canvas) override {
         canvas->clear(SK_ColorBLACK);
 
         SkAutoTUnref<SkImageFilter> gradient(SkBitmapSource::Create(fGradientCircle));
         SkAutoTUnref<SkImageFilter> checkerboard(SkBitmapSource::Create(fCheckerboard));
         SkAutoTUnref<SkShader> noise(SkPerlinNoiseShader::CreateFractalNoise(
             SkDoubleToScalar(0.1), SkDoubleToScalar(0.05), 1, 0));
 
         SkPoint3 pointLocation = SkPoint3::Make(0, 0, SkIntToScalar(10));
         SkPoint3 spotLocation = SkPoint3::Make(SkIntToScalar(-10), 
                                                SkIntToScalar(-10), 
@@ skipping 63 matching lines @@
             canvas->restore();
             canvas->translate(0, r.height() * scales[j].fY + margin);
         }
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
             filters[i]->unref();
         }
     }
 
 private:
-    bool fInitialized;
     SkBitmap fCheckerboard;
     SkBitmap fGradientCircle;
+
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new ImageFiltersScaledGM; }
-static GMRegistry reg(MyFactory);
-
+DEF_GM(return new ImageFiltersScaledGM;)
 }