aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gm/colorwheel.cpp4
-rw-r--r--gm/displacement.cpp4
-rw-r--r--gm/imagefiltersclipped.cpp4
-rw-r--r--gm/imagefiltersscaled.cpp4
-rw-r--r--gm/offsetimagefilter.cpp4
-rw-r--r--gm/tileimagefilter.cpp4
-rw-r--r--gm/xfermodeimagefilter.cpp4
-rw-r--r--gyp/SampleApp.gyp1
-rw-r--r--gyp/gmslides.gypi3
-rw-r--r--gyp/tools.gyp7
-rw-r--r--samplecode/SampleColorFilter.cpp4
-rw-r--r--samplecode/SampleFatBits.cpp4
-rw-r--r--samplecode/SampleUnpremul.cpp4
-rw-r--r--tools/Checkerboard.cpp28
-rw-r--r--tools/Checkerboard.h34
-rw-r--r--tools/sk_tool_utils.cpp17
-rw-r--r--tools/sk_tool_utils.h17
17 files changed, 54 insertions, 93 deletions
diff --git a/gm/colorwheel.cpp b/gm/colorwheel.cpp
index 8cf94646e5..db2924da6f 100644
--- a/gm/colorwheel.cpp
+++ b/gm/colorwheel.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "Resources.h"
#include "SkData.h"
#include "gm.h"
@@ -31,7 +31,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) {
- sk_tools::DrawCheckerboard(canvas);
+ sk_tool_utils::draw_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
diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index f35d5acd3f..bcf759a4bf 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SkBitmapSource.h"
#include "SkDisplacementMapEffect.h"
#include "gm.h"
@@ -48,7 +48,7 @@ protected:
void make_checkerboard(SkBitmap* bitmap, int w, int h) {
bitmap->allocN32Pixels(w, h);
SkCanvas canvas(*bitmap);
- sk_tools::DrawCheckerboard(&canvas, 0xFF244484, 0xFF804020, 8);
+ sk_tool_utils::draw_checkerboard(&canvas, 0xFF244484, 0xFF804020, 8);
}
virtual SkISize onISize() {
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp
index 259342cc27..98f5bbb4c2 100644
--- a/gm/imagefiltersclipped.cpp
+++ b/gm/imagefiltersclipped.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SkBitmapSource.h"
#include "SkBlurImageFilter.h"
#include "SkColor.h"
@@ -64,7 +64,7 @@ protected:
if (!fInitialized) {
fCheckerboard.allocN32Pixels(64, 64);
SkCanvas checkerboardCanvas(fCheckerboard);
- sk_tools::DrawCheckerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
+ sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
this->make_gradient_circle(64, 64);
fInitialized = true;
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp
index 084de00fbe..3a928b7b16 100644
--- a/gm/imagefiltersscaled.cpp
+++ b/gm/imagefiltersscaled.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SkBitmapSource.h"
#include "SkBlurImageFilter.h"
#include "SkColor.h"
@@ -64,7 +64,7 @@ protected:
if (!fInitialized) {
fCheckerboard.allocN32Pixels(64, 64);
SkCanvas checkerboardCanvas(fCheckerboard);
- sk_tools::DrawCheckerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
+ sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
this->make_gradient_circle(64, 64);
fInitialized = true;
diff --git a/gm/offsetimagefilter.cpp b/gm/offsetimagefilter.cpp
index 2e80a96e34..fb896ddc0f 100644
--- a/gm/offsetimagefilter.cpp
+++ b/gm/offsetimagefilter.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SkBitmapSource.h"
#include "SkOffsetImageFilter.h"
#include "gm.h"
@@ -73,7 +73,7 @@ protected:
fCheckerboard.allocN32Pixels(80, 80);
SkCanvas checkerboardCanvas(fCheckerboard);
- sk_tools::DrawCheckerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
+ sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
fInitialized = true;
}
diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp
index 1d58def66b..89a6c6c268 100644
--- a/gm/tileimagefilter.cpp
+++ b/gm/tileimagefilter.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SkBitmapSource.h"
#include "SkColorFilterImageFilter.h"
#include "SkColorMatrixFilter.h"
@@ -52,7 +52,7 @@ protected:
fCheckerboard.allocN32Pixels(80, 80);
SkCanvas checkerboardCanvas(fCheckerboard);
- sk_tools::DrawCheckerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
+ sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
fInitialized = true;
}
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp
index b90543ffb4..0134bd3cd3 100644
--- a/gm/xfermodeimagefilter.cpp
+++ b/gm/xfermodeimagefilter.cpp
@@ -6,7 +6,7 @@
*/
#include "gm.h"
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SkArithmeticMode.h"
#include "SkOffsetImageFilter.h"
#include "SkXfermodeImageFilter.h"
@@ -70,7 +70,7 @@ protected:
fCheckerboard.allocN32Pixels(80, 80);
SkCanvas checkerboardCanvas(fCheckerboard);
- sk_tools::DrawCheckerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
+ sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8);
}
void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index f961f1182b..7767835437 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -152,7 +152,6 @@
'skia_lib.gyp:skia_lib',
'tools.gyp:resources',
'tools.gyp:sk_tool_utils',
- 'tools.gyp:checkerboard',
'views.gyp:views',
'views_animated.gyp:views_animated',
'xml.gyp:xml',
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index e716644750..abcb86767b 100644
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -7,9 +7,6 @@
'../src/images',
'../src/lazy',
],
- 'dependencies': [
- 'tools.gyp:checkerboard',
- ],
'conditions': [
# If we're building SampleApp on the bots, no need to link in the GM slides.
# We're not going to run it; we're only making sure it still builds.
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 8d2c7037b1..1b196a75b1 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -89,13 +89,6 @@
},
},
{
- 'target_name': 'checkerboard',
- 'type': 'static_library',
- 'sources': [ '../tools/Checkerboard.cpp', ],
- 'dependencies': [ 'skia_lib.gyp:skia_lib', ],
- 'direct_dependent_settings': { 'include_dirs': [ '../tools', ], },
- },
- {
'target_name' : 'timer',
'type': 'static_library',
'sources': [
diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index 175f724710..af1cd935a2 100644
--- a/samplecode/SampleColorFilter.cpp
+++ b/samplecode/SampleColorFilter.cpp
@@ -5,7 +5,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SampleCode.h"
#include "SkView.h"
#include "SkCanvas.h"
@@ -118,7 +118,7 @@ class ColorFilterView : public SampleView {
public:
ColorFilterView() {
fBitmap = createBitmap(N);
- fShader = sk_tools::CreateCheckerboardShader(
+ fShader = sk_tool_utils::create_checkerboard_shader(
0xFFCCCCCC, 0xFFFFFFFF, 12);
if (false) { // avoid bit rot, suppress warning
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index 9da351370a..dfe5ba0af7 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "SampleCode.h"
#include "SkView.h"
#include "SkCanvas.h"
@@ -87,7 +87,7 @@ public:
fBounds.set(0, 0, SkIntToScalar(width * zoom), SkIntToScalar(height * zoom));
fMatrix.setScale(SkIntToScalar(zoom), SkIntToScalar(zoom));
fInverse.setScale(SK_Scalar1 / zoom, SK_Scalar1 / zoom);
- fShader.reset(sk_tools::CreateCheckerboardShader(
+ fShader.reset(sk_tool_utils::create_checkerboard_shader(
0xFFCCCCCC, 0xFFFFFFFF, zoom));
SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index 889d06780e..7e5c950ccc 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -7,7 +7,7 @@
#include "gm.h"
-#include "Checkerboard.h"
+#include "sk_tool_utils.h"
#include "Resources.h"
#include "SampleCode.h"
#include "SkBlurMask.h"
@@ -76,7 +76,7 @@ protected:
}
void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE {
- sk_tools::DrawCheckerboard(canvas, 0xFFCCCCCC, 0xFFFFFFFF, 12);
+ sk_tool_utils::draw_checkerboard(canvas, 0xFFCCCCCC, 0xFFFFFFFF, 12);
}
void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/tools/Checkerboard.cpp b/tools/Checkerboard.cpp
deleted file mode 100644
index 80de125f15..0000000000
--- a/tools/Checkerboard.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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 "Checkerboard.h"
-#include "SkCanvas.h"
-#include "SkShader.h"
-
-SkShader* sk_tools::CreateCheckerboardShader(
- SkColor c1, SkColor c2, int size) {
- SkBitmap bm;
- bm.allocN32Pixels(2 * size, 2 * size);
- bm.eraseColor(c1);
- bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2);
- bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2);
- return SkShader::CreateBitmapShader(
- bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
-}
-
-void sk_tools::DrawCheckerboard(SkCanvas* canvas,
- SkColor c1, SkColor c2, int size) {
- SkPaint paint;
- paint.setShader(CreateCheckerboardShader(c1, c2, size))->unref();
- canvas->drawPaint(paint);
-}
diff --git a/tools/Checkerboard.h b/tools/Checkerboard.h
deleted file mode 100644
index b81e43616f..0000000000
--- a/tools/Checkerboard.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef Checkerboard_DEFINED
-#define Checkerboard_DEFINED
-
-#include "SkColor.h"
-
-class SkCanvas;
-class SkShader;
-
-namespace sk_tools {
-
-/** Returns a newly created CheckerboardShader. */
-SkShader* CreateCheckerboardShader(SkColor c1, SkColor c2, int size);
-
-/** Draw a checkerboard pattern in the current canvas, restricted to
- the current clip. */
-void DrawCheckerboard(SkCanvas* canvas,
- SkColor color1,
- SkColor color2,
- int size);
-
-/** A default checkerboard. */
-inline void DrawCheckerboard(SkCanvas* canvas) {
- sk_tools::DrawCheckerboard(canvas, 0xFF999999, 0xFF666666, 8);
-}
-
-} // namespace sk_tools
-
-#endif // Checkerboard_DEFINED
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp
index 02001238e9..560384fb7c 100644
--- a/tools/sk_tool_utils.cpp
+++ b/tools/sk_tool_utils.cpp
@@ -10,6 +10,7 @@
#include "SkBitmap.h"
#include "SkCanvas.h"
+#include "SkShader.h"
#include "SkTestScalerContext.h"
DEFINE_bool(portableFonts, false, "Use portable fonts");
@@ -59,4 +60,20 @@ void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y,
canvas->writePixels(info, tmp.getPixels(), tmp.rowBytes(), x, y);
}
+SkShader* create_checkerboard_shader(SkColor c1, SkColor c2, int size) {
+ SkBitmap bm;
+ bm.allocN32Pixels(2 * size, 2 * size);
+ bm.eraseColor(c1);
+ bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2);
+ bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2);
+ return SkShader::CreateBitmapShader(
+ bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
+}
+
+void draw_checkerboard(SkCanvas* canvas, SkColor c1, SkColor c2, int size) {
+ SkPaint paint;
+ paint.setShader(create_checkerboard_shader(c1, c2, size))->unref();
+ canvas->drawPaint(paint);
+}
+
} // namespace sk_tool_utils
diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h
index e9bda5f982..faf57f3ba4 100644
--- a/tools/sk_tool_utils.h
+++ b/tools/sk_tool_utils.h
@@ -8,12 +8,14 @@
#ifndef sk_tool_utils_DEFINED
#define sk_tool_utils_DEFINED
+#include "SkColor.h"
#include "SkImageInfo.h"
#include "SkTypeface.h"
class SkBitmap;
class SkCanvas;
class SkPaint;
+class SkShader;
class SkTestFont;
namespace sk_tool_utils {
@@ -38,6 +40,21 @@ namespace sk_tool_utils {
SkTypeface* create_font(const char* name, SkTypeface::Style );
SkTypeface* resource_font(const char* name, SkTypeface::Style );
+ /** Returns a newly created CheckerboardShader. */
+ SkShader* create_checkerboard_shader(SkColor c1, SkColor c2, int size);
+
+ /** Draw a checkerboard pattern in the current canvas, restricted to
+ the current clip. */
+ void draw_checkerboard(SkCanvas* canvas,
+ SkColor color1,
+ SkColor color2,
+ int size);
+
+ /** A default checkerboard. */
+ inline void draw_checkerboard(SkCanvas* canvas) {
+ sk_tool_utils::draw_checkerboard(canvas, 0xFF999999, 0xFF666666, 8);
+ }
+
} // namespace sk_tool_utils
#endif // sk_tool_utils_DEFINED
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 13:52:59 +0000