diff options
author | robertphillips <robertphillips@google.com> | 2015-06-04 06:53:37 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-04 06:53:37 -0700 |
commit | 0be685755f942baea26c66a87226b569fc17e960 (patch) | |
tree | c82f1f7fefbdd341df38f70efd373438d26f8717 /gm/tileimagefilter.cpp | |
parent | d18bb23667d11db4779c13253a7e0cd90bf7a57f (diff) |
Fix dst bound reported by SkTileImageFilter
In the example from the bug we had the filter DAG:
color filter (table)
0: xfermode filter (arith)
0: tile filter [0,80,34,114] -> [0,80,800,480]
0: color filter (table)
0: bitmap src 34x34 -> [0,80,34,114]
1: color filter (table)
0: picture filter [0, 80, 800, 480]
computeFastBounds was coming out of the DAG with a bound of [0,80,34,114] which didn't represent the pixels that would be drawn.
This CL updates SkTileImageFilter to correctly set the bound for the pixels it will hit.
BUG=493783
Committed: https://skia.googlesource.com/skia/+/05be93bbdf09576f7903130e3b106b0a8c7c4b4e
Review URL: https://codereview.chromium.org/1152553006
Diffstat (limited to 'gm/tileimagefilter.cpp')
-rw-r--r-- | gm/tileimagefilter.cpp | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp index 2c4f6b2b2c..82393087b0 100644 --- a/gm/tileimagefilter.cpp +++ b/gm/tileimagefilter.cpp @@ -16,46 +16,48 @@ #define HEIGHT 100 #define MARGIN 12 +static SkBitmap make_bitmap() { + SkBitmap bitmap; + bitmap.allocN32Pixels(50, 50); + SkCanvas canvas(bitmap); + canvas.clear(0xFF000000); + SkPaint paint; + paint.setAntiAlias(true); + sk_tool_utils::set_portable_typeface(&paint); + paint.setColor(0xD000D000); + paint.setTextSize(SkIntToScalar(50)); + const char* str = "e"; + canvas.drawText(str, strlen(str), SkIntToScalar(10), SkIntToScalar(45), paint); + return bitmap; +} + + namespace skiagm { class TileImageFilterGM : public GM { public: - TileImageFilterGM() : fInitialized(false) { + TileImageFilterGM() { this->setBGColor(0xFF000000); } protected: - virtual SkString onShortName() { + SkString onShortName() override { return SkString("tileimagefilter"); } - void make_bitmap() { - fBitmap.allocN32Pixels(50, 50); - SkCanvas canvas(fBitmap); - canvas.clear(0xFF000000); - SkPaint paint; - paint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface(&paint); - paint.setColor(0xD000D000); - paint.setTextSize(SkIntToScalar(50)); - const char* str = "e"; - canvas.drawText(str, strlen(str), SkIntToScalar(10), SkIntToScalar(45), paint); - } - - virtual SkISize onISize() { + SkISize onISize() override{ return SkISize::Make(WIDTH, HEIGHT); } - virtual void onDraw(SkCanvas* canvas) { - if (!fInitialized) { - make_bitmap(); + void onOnceBeforeDraw() override { + fBitmap = make_bitmap(); - fCheckerboard.allocN32Pixels(80, 80); - SkCanvas checkerboardCanvas(fCheckerboard); - sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8); + fCheckerboard.allocN32Pixels(80, 80); + SkCanvas checkerboardCanvas(fCheckerboard); + sk_tool_utils::draw_checkerboard(&checkerboardCanvas, 0xFFA0A0A0, 0xFF404040, 8); + } - fInitialized = true; - } + void onDraw(SkCanvas* canvas) override { canvas->clear(SK_ColorBLACK); int x = 0, y = 0; @@ -109,14 +111,14 @@ protected: canvas->restore(); } private: + SkBitmap fBitmap; + SkBitmap fCheckerboard; + typedef GM INHERITED; - SkBitmap fBitmap, fCheckerboard; - bool fInitialized; }; ////////////////////////////////////////////////////////////////////////////// -static GM* MyFactory(void*) { return new TileImageFilterGM; } -static GMRegistry reg(MyFactory); +DEF_GM( return SkNEW(TileImageFilterGM); ) } |