commit 943a462fef57832e2683894bb9f2f36ac25d98f7
author robertphillips <robertphillips@google.com> Thu Sep 03 13:32:33 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Sep 03 13:32:33 2015 -0700
tree c08c082d19d7dfb0db1331739b04cdb8b174440c
parent 44c3128bd892d32f797810d93ef1ed392e0b902d

Minor code cleanup (left over from prior CL)

This was requested in https://codereview.chromium.org/1309543012/ (Add new GM to directly exercise perspective bitmap drawing)

Review URL: https://codereview.chromium.org/1320673011

gm/lightingshader.cpp

diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp
index 8bb3595..9c45c9b 100644
--- a/gm/lightingshader.cpp
+++ b/gm/lightingshader.cpp
@@ -11,18 +11,6 @@
 #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;
@@ -87,7 +75,11 @@
     }
 
     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);