Minor code cleanup (left over from prior CL)

gm/displacement.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapSource.h"
 #include "SkDisplacementMapEffect.h"
 #include "gm.h"
 #include "sk_tool_utils.h"
 
 namespace skiagm {
 
 class DisplacementMapGM : public GM {
 public:
-    DisplacementMapGM() : fInitialized(false) {
+    DisplacementMapGM() {
         this->setBGColor(0xFF000000);
     }
 
 protected:
-    virtual SkString onShortName() {
+    SkString onShortName() override {
         return SkString("displacement");
     }
 
-    void make_bitmaps() {
-        make_bitmap();
-        make_checkerboard(&fCheckerboard, 80, 80);
-        make_checkerboard(&fSmall,        64, 64);
-        make_checkerboard(&fLarge,        96, 96);
-        make_checkerboard(&fLargeW,       96, 64);
-        make_checkerboard(&fLargeH,       64, 96);
+    void onOnceBeforeDraw() override {
+        fBitmap = sk_tool_utils::create_string_bitmap(80, 80, 0xFF884422, 15, 55, 96, "g");
+
+        SkColor c1 = sk_tool_utils::color_to_565(0xFF244484);
+        SkColor c2 = sk_tool_utils::color_to_565(0xFF804020);
+
+        fCheckerboard = sk_tool_utils::create_checkerboard_bitmap(80, 80, c1, c2, 8);
+        fSmall = sk_tool_utils::create_checkerboard_bitmap(64, 64, c1, c2, 8);
+        fLarge = sk_tool_utils::create_checkerboard_bitmap(96, 96, c1, c2, 8);
+        fLargeW = sk_tool_utils::create_checkerboard_bitmap(96, 64, c1, c2, 8);
+        fLargeH = sk_tool_utils::create_checkerboard_bitmap(64, 96, c1, c2, 8);
     }
 
-    void make_bitmap() {
-        fBitmap.allocN32Pixels(80, 80);
-        SkCanvas canvas(fBitmap);
-        canvas.clear(0x00000000);
-        SkPaint paint;
-        paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
-        paint.setColor(sk_tool_utils::color_to_565(0xFF884422));
-        paint.setTextSize(SkIntToScalar(96));
-        const char* str = "g";
-        canvas.drawText(str, strlen(str), SkIntToScalar(15), SkIntToScalar(55), paint);
-    }
-
-    void make_checkerboard(SkBitmap* bitmap, int w, int h) {
-        bitmap->allocN32Pixels(w, h);
-        SkCanvas canvas(*bitmap);
-        sk_tool_utils::draw_checkerboard(&canvas, sk_tool_utils::color_to_565(0xFF244484),
-            sk_tool_utils::color_to_565(0xFF804020), 8);
-    }
-
-    virtual SkISize onISize() {
+    SkISize onISize() override {
         return SkISize::Make(500, 500);
     }
 
-    void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
+    void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) const {
         canvas->save();
         canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height())));
         canvas->drawBitmap(fBitmap, 0, 0, &paint);
         canvas->restore();
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
-        if (!fInitialized) {
-            make_bitmaps();
-            fInitialized = true;
-        }
+    void onDraw(SkCanvas* canvas) override {
         canvas->clear(SK_ColorBLACK);
         SkPaint paint;
         SkAutoTUnref<SkImageFilter> displ(SkBitmapSource::Create(fCheckerboard));
         paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ))->unref();
         drawClippedBitmap(canvas, 0, 0, paint);
         paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ))->unref();
@@ skipping 115 matching lines @@
         // and color should use the same bitmap, given to SkCanvas::drawBitmap()
         // as an input argument.
         paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
             40.0f, nullptr))->unref();
         drawClippedBitmap(canvas, 400, 400, paint);
     }
 
 private:
+    SkBitmap fBitmap, fCheckerboard, fSmall, fLarge, fLargeW, fLargeH;
+
     typedef GM INHERITED;
-    SkBitmap fBitmap, fCheckerboard, fSmall, fLarge, fLargeW, fLargeH;
-    bool fInitialized;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-static GM* MyFactory(void*) { return new DisplacementMapGM; }
-static GMRegistry reg(MyFactory);
-
+DEF_GM(return new DisplacementMapGM;)
 }