50c044b9ad
Reason for revert: Introduced memory leak; pixel changes in Chrome. Original issue's description: > Matrix convolution bounds fix; affectsTransparentBlack fixes. > > Because the convolution kernel is (currently) applied in device space, > there's no way to know which object-space pixels will be touched. So > return false from canComputeFastBounds(). > > The results from the matrixconvolution GM were actually wrong, since > they were showing edge differences on the clip boundaries, where they > should really only show on crop boundaries. I added a crop to the GM > to keep the results the same (which are useful to test the different > convolution tile modes). > > While I was at it, SkImageFilter::affectsTransparentBlack() was > inapplicable on most things except color filters, and its use on > leaf nodes was confusing. So I removed it, and made > SkImageFilter::canComputeFastBounds() virtual instead. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/8705ec80518ef551994b82ca5ccaeb0241d6adec TBR=reed@google.com,reed@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1497083005
117 lines
4.3 KiB
C++
117 lines
4.3 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "SkColor.h"
|
|
#include "SkMatrixConvolutionImageFilter.h"
|
|
#include "SkGradientShader.h"
|
|
|
|
namespace skiagm {
|
|
|
|
class MatrixConvolutionGM : public GM {
|
|
public:
|
|
MatrixConvolutionGM() {
|
|
this->setBGColor(0x00000000);
|
|
}
|
|
|
|
protected:
|
|
|
|
SkString onShortName() override {
|
|
return SkString("matrixconvolution");
|
|
}
|
|
|
|
void makeBitmap() {
|
|
fBitmap.allocN32Pixels(80, 80);
|
|
SkCanvas canvas(fBitmap);
|
|
canvas.clear(0x00000000);
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
sk_tool_utils::set_portable_typeface(&paint);
|
|
paint.setColor(0xFFFFFFFF);
|
|
paint.setTextSize(SkIntToScalar(180));
|
|
SkPoint pts[2] = { SkPoint::Make(0, 0),
|
|
SkPoint::Make(0, SkIntToScalar(80)) };
|
|
SkColor colors[2] = { 0xFFFFFFFF, 0x40404040 };
|
|
SkScalar pos[2] = { 0, SkIntToScalar(80) };
|
|
paint.setShader(SkGradientShader::CreateLinear(
|
|
pts, colors, pos, 2, SkShader::kClamp_TileMode))->unref();
|
|
const char* str = "e";
|
|
canvas.drawText(str, strlen(str), SkIntToScalar(-10), SkIntToScalar(80), paint);
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(500, 300);
|
|
}
|
|
|
|
void draw(SkCanvas* canvas, int x, int y, const SkIPoint& kernelOffset,
|
|
SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAlpha,
|
|
const SkImageFilter::CropRect* cropRect = nullptr) {
|
|
SkScalar kernel[9] = {
|
|
SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
|
|
SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1),
|
|
SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
|
|
};
|
|
SkISize kernelSize = SkISize::Make(3, 3);
|
|
SkScalar gain = 0.3f, bias = SkIntToScalar(100);
|
|
SkPaint paint;
|
|
SkAutoTUnref<SkImageFilter> filter(
|
|
SkMatrixConvolutionImageFilter::Create(kernelSize,
|
|
kernel,
|
|
gain,
|
|
bias,
|
|
kernelOffset,
|
|
tileMode,
|
|
convolveAlpha,
|
|
nullptr,
|
|
cropRect));
|
|
paint.setImageFilter(filter);
|
|
canvas->save();
|
|
canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
|
|
canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()),
|
|
SkIntToScalar(fBitmap.height())));
|
|
canvas->drawBitmap(fBitmap, 0, 0, &paint);
|
|
canvas->restore();
|
|
}
|
|
|
|
typedef SkMatrixConvolutionImageFilter MCIF;
|
|
|
|
void onOnceBeforeDraw() override {
|
|
this->makeBitmap();
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
canvas->clear(SK_ColorBLACK);
|
|
SkIPoint kernelOffset = SkIPoint::Make(1, 0);
|
|
for (int x = 10; x < 310; x += 100) {
|
|
this->draw(canvas, x, 10, kernelOffset, MCIF::kClamp_TileMode, true);
|
|
this->draw(canvas, x, 110, kernelOffset, MCIF::kClampToBlack_TileMode, true);
|
|
this->draw(canvas, x, 210, kernelOffset, MCIF::kRepeat_TileMode, true);
|
|
kernelOffset.fY++;
|
|
}
|
|
kernelOffset.fY = 1;
|
|
SkImageFilter::CropRect rect(SkRect::MakeXYWH(10, 5, 60, 60));
|
|
this->draw(canvas, 310, 10, kernelOffset, MCIF::kClamp_TileMode, true, &rect);
|
|
this->draw(canvas, 310, 110, kernelOffset, MCIF::kClampToBlack_TileMode, true, &rect);
|
|
this->draw(canvas, 310, 210, kernelOffset, MCIF::kRepeat_TileMode, true, &rect);
|
|
|
|
this->draw(canvas, 410, 10, kernelOffset, MCIF::kClamp_TileMode, false);
|
|
this->draw(canvas, 410, 110, kernelOffset, MCIF::kClampToBlack_TileMode, false);
|
|
this->draw(canvas, 410, 210, kernelOffset, MCIF::kRepeat_TileMode, false);
|
|
}
|
|
|
|
private:
|
|
SkBitmap fBitmap;
|
|
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_GM(return new MatrixConvolutionGM;)
|
|
|
|
}
|