c3176aa5e5
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
Committed: https://skia.googlesource.com/skia/+/0be685755f942baea26c66a87226b569fc17e960
Review URL: https://codereview.chromium.org/1152553006
108 lines
3.1 KiB
C++
108 lines
3.1 KiB
C++
/*
|
|
* 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 "SkBitmapSource.h"
|
|
#include "SkTileImageFilter.h"
|
|
#include "gm.h"
|
|
|
|
static void create_circle_texture(SkBitmap* bm, SkColor color) {
|
|
SkCanvas canvas(*bm);
|
|
canvas.clear(0xFF000000);
|
|
|
|
SkPaint paint;
|
|
paint.setColor(color);
|
|
paint.setStrokeWidth(3);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
canvas.drawCircle(SkScalarHalf(bm->width()), SkScalarHalf(bm->height()),
|
|
SkScalarHalf(bm->width()), paint);
|
|
}
|
|
|
|
namespace skiagm {
|
|
|
|
class BigTileImageFilterGM : public GM {
|
|
public:
|
|
BigTileImageFilterGM() {
|
|
this->setBGColor(0xFF000000);
|
|
}
|
|
|
|
protected:
|
|
|
|
SkString onShortName() override {
|
|
return SkString("bigtileimagefilter");
|
|
}
|
|
|
|
SkISize onISize() override{
|
|
return SkISize::Make(kWidth, kHeight);
|
|
}
|
|
|
|
void onOnceBeforeDraw() override {
|
|
fRedBitmap.allocN32Pixels(kBitmapSize, kBitmapSize);
|
|
create_circle_texture(&fRedBitmap, SK_ColorRED);
|
|
|
|
fGreenBitmap.allocN32Pixels(kBitmapSize, kBitmapSize);
|
|
create_circle_texture(&fGreenBitmap, SK_ColorGREEN);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
canvas->clear(SK_ColorBLACK);
|
|
|
|
{
|
|
SkPaint p;
|
|
|
|
SkRect bound = SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight));
|
|
SkAutoTUnref<SkBitmapSource> bms(SkBitmapSource::Create(fRedBitmap));
|
|
SkAutoTUnref<SkTileImageFilter> tif(SkTileImageFilter::Create(
|
|
SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)),
|
|
SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight)),
|
|
bms));
|
|
p.setImageFilter(tif);
|
|
|
|
canvas->saveLayer(&bound, &p);
|
|
canvas->restore();
|
|
}
|
|
|
|
{
|
|
SkPaint p2;
|
|
|
|
SkRect bound2 = SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize));
|
|
|
|
SkAutoTUnref<SkTileImageFilter> tif2(SkTileImageFilter::Create(
|
|
SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)),
|
|
SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)),
|
|
NULL));
|
|
p2.setImageFilter(tif2);
|
|
|
|
canvas->translate(320, 320);
|
|
canvas->saveLayer(&bound2, &p2);
|
|
canvas->setMatrix(SkMatrix::I());
|
|
|
|
SkRect bound3 = SkRect::MakeXYWH(320, 320,
|
|
SkIntToScalar(kBitmapSize),
|
|
SkIntToScalar(kBitmapSize));
|
|
canvas->drawBitmapRectToRect(fGreenBitmap, &bound2, bound3);
|
|
canvas->restore();
|
|
}
|
|
}
|
|
|
|
private:
|
|
static const int kWidth = 512;
|
|
static const int kHeight = 512;
|
|
static const int kBitmapSize = 64;
|
|
|
|
SkBitmap fRedBitmap;
|
|
SkBitmap fGreenBitmap;
|
|
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_GM( return SkNEW(BigTileImageFilterGM); )
|
|
|
|
}
|