Minor code cleanup (left over from prior CL)

gm/lightingshader.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 "SkLightingShader.h"
 #include "SkPoint3.h"
 #include "SkShader.h"
 
-static SkBitmap make_checkerboard(int texSize) {
-    SkBitmap bitmap;
-    bitmap.allocN32Pixels(texSize, texSize);
-
-    SkCanvas canvas(bitmap);
-    sk_tool_utils::draw_checkerboard(&canvas,
-                                     sk_tool_utils::color_to_565(0x0),
-                                     sk_tool_utils::color_to_565(0xFF804020),
-                                     8);
-    return bitmap;
-}
-
 // Create a hemispherical normal map
 static SkBitmap make_hemi_normalmap(int texSize) {
     SkBitmap hemi;
     hemi.allocN32Pixels(texSize, texSize);
 
     sk_tool_utils::create_hemi_normal_map(&hemi, SkIRect::MakeWH(texSize, texSize));
     return hemi;
 }
 
 // Create a truncated pyramid normal map
@@ skipping 44 matching lines @@
 
     SkString onShortName() override {
         return SkString("lightingshader");
     }
 
     SkISize onISize() override {
         return SkISize::Make(kGMSize, kGMSize);
     }
 
     void onOnceBeforeDraw() override {
-        fDiffuse = make_checkerboard(kTexSize);
+        fDiffuse = sk_tool_utils::create_checkerboard_bitmap(
+                                                        kTexSize, kTexSize,
+                                                        sk_tool_utils::color_to_565(0x0),
+                                                        sk_tool_utils::color_to_565(0xFF804020),
+                                                        8);
 
         fNormalMaps[kHemi_NormalMap]    = make_hemi_normalmap(kTexSize);
         fNormalMaps[kFrustum_NormalMap] = make_frustum_normalmap(kTexSize);
         fNormalMaps[kTetra_NormalMap]   = make_tetra_normalmap(kTexSize);
     }
 
     void drawRect(SkCanvas* canvas, const SkRect& r, NormalMap mapType) {
 
         SkRect bitmapBounds = SkRect::MakeIWH(fDiffuse.width(), fDiffuse.height());
 
@@ skipping 79 matching lines @@
 
     SkAutoTUnref<const SkLightingShader::Lights>  fLights;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new LightingShaderGM;)
 }