commit 878fa0204bc246ec5fbaca4aa3c81aaefccc30a1
author halcanary <halcanary@google.com> Mon Jan 26 11:24:32 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Jan 26 11:24:32 2015 -0800
tree faef3e19c04dbabc482d43d33c4c2d15bc173639
parent 4b952751c093801675307df6f3c4c25749e72925

Factor out checkerboard function in gm and sampleapp into tools.

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

gm/displacement.cpp

diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index dddf8a5..f35d5ac 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -5,9 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "gm.h"
-#include "SkDisplacementMapEffect.h"
+#include "Checkerboard.h"
 #include "SkBitmapSource.h"
+#include "SkDisplacementMapEffect.h"
+#include "gm.h"
 
 namespace skiagm {
 
@@ -47,22 +48,7 @@
     void make_checkerboard(SkBitmap* bitmap, int w, int h) {
         bitmap->allocN32Pixels(w, h);
         SkCanvas canvas(*bitmap);
-        canvas.clear(0x00000000);
-        SkPaint darkPaint;
-        darkPaint.setColor(0xFF804020);
-        SkPaint lightPaint;
-        lightPaint.setColor(0xFF244484);
-        for (int y = 0; y < h; y += 16) {
-          for (int x = 0; x < w; x += 16) {
-            canvas.save();
-            canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
-            canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
-            canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
-            canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);
-            canvas.drawRect(SkRect::MakeXYWH(8, 8, 8, 8), darkPaint);
-            canvas.restore();
-          }
-        }
+        sk_tools::DrawCheckerboard(&canvas, 0xFF244484, 0xFF804020, 8);
     }
 
     virtual SkISize onISize() {