Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: gm/colorwheel.cpp

Issue 834303005: Factor out checkerboard function in gm and sampleapp into tools. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: ignore pdf gm change Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gm/colorwheel.cpp
diff --git a/gm/colorwheel.cpp b/gm/colorwheel.cpp
index 93af361720d18573a7621542854c474890d2512c..3b22fa50034c6889aee5d4b154fac4083aba905f 100644
--- a/gm/colorwheel.cpp
+++ b/gm/colorwheel.cpp
@@ -8,27 +8,10 @@
#include "Resources.h"
#include "SkData.h"
#include "SkDecodingImageGenerator.h"
+#include "checkerboard.h"
#include "gm.h"
#include "sk_tool_utils.h"
-static void checkerboard(
- SkCanvas* canvas, int w, int h, int size, SkColor c1, SkColor c2) {
- SkAutoCanvasRestore autoCanvasRestore(canvas, true);
- canvas->clipRect(SkRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h)));
- canvas->drawColor(c1);
- SkPaint paint;
- paint.setColor(c2);
- SkScalar s = SkIntToScalar(size);
- for (int y = 0; y < h; y += size) {
- SkScalar ty = SkIntToScalar(y);
- bool oddRow = (y % (2 * size)) != 0;
- for (int x = oddRow ? size : 0; x < w; x += (2 * size)) {
- SkScalar tx = SkIntToScalar(x);
- canvas->drawRect(SkRect::MakeXYWH(tx, ty, s, s), paint);
- }
- }
-}
-
static void draw_bitmap(SkCanvas* canvas, const char* resource, int x, int y) {
SkBitmap bitmap;
if (GetResourceAsBitmap(resource, &bitmap)) {
@@ -49,8 +32,7 @@ static void draw_bitmap(SkCanvas* canvas, const char* resource, int x, int y) {
background and compression artifacts.
*/
DEF_SIMPLE_GM(colorwheel, canvas, 256, 256) {
- canvas->clear(SK_ColorWHITE);
- checkerboard(canvas, 256, 556, 8, 0xFF999999, 0xFF666666);
+ skiagm::Checkerboard(canvas);
draw_bitmap(canvas, "color_wheel.png", 0, 0); // top left
draw_bitmap(canvas, "color_wheel.gif", 128, 0); // top right
draw_bitmap(canvas, "color_wheel.webp", 0, 128); // bottom left
« gm/checkerboard.h ('K') | « gm/checkerboard.cpp ('k') | gm/displacement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698