Minor code cleanup (left over from prior CL)

gm/perspshaders.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkGradientShader.h"
 #include "SkImage.h"
 #include "SkPath.h"
 #include "SkSurface.h"
 
 static SkImage* make_image(SkCanvas* origCanvas, int w, int h) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(w, h);
     SkAutoTUnref<SkSurface> surface(origCanvas->newSurface(info));
     if (nullptr == surface) {
         surface.reset(SkSurface::NewRaster(info));
     }
     SkCanvas* canvas = surface->getCanvas();
 
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorRED, SK_ColorGREEN, w/10);
     return surface->newImageSnapshot();
 }
 
-static SkBitmap make_bitmap(int w, int h) {
-    SkBitmap bitmap;
-    bitmap.allocN32Pixels(w, h);
-    SkCanvas canvas(bitmap);
-
-    sk_tool_utils::draw_checkerboard(&canvas, SK_ColorBLUE, SK_ColorYELLOW, w/10);
-    return bitmap;
-}
-
 namespace skiagm {
 
 class PerspShadersGM : public GM {
 public:
     PerspShadersGM(bool doAA) : fDoAA(doAA) { }
 
 protected:
     SkString onShortName() override {
         SkString name;
         name.printf("persp_shaders_%s",
                      fDoAA ? "aa" : "bw");
         return name;
     }
 
     SkISize onISize() override {
         return SkISize::Make(kCellSize*kNumCols, kCellSize*kNumRows);
     }
 
     void onOnceBeforeDraw() override {
-        fBitmap = make_bitmap(kCellSize, kCellSize);
+        fBitmap = sk_tool_utils::create_checkerboard_bitmap(kCellSize, kCellSize,
+                                                            SK_ColorBLUE, SK_ColorYELLOW,
+                                                            kCellSize/10);
 
         fBitmapShader.reset(SkShader::CreateBitmapShader(fBitmap,
                                                          SkShader::kClamp_TileMode,
                                                          SkShader::kClamp_TileMode));
         SkPoint pts1[] = {
             { 0, 0 },
             { SkIntToScalar(kCellSize), SkIntToScalar(kCellSize) }
         };
         SkPoint pts2[] = {
             { 0, 0 },
@@ skipping 110 matching lines @@
     SkBitmap                fBitmap;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new PerspShadersGM(true);)
 DEF_GM(return new PerspShadersGM(false);)
 }