AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ComposeColorFilter in factory to collapse consecutive filters (when possible).

Browse Source 
Change asColorFilter to reflect its reliance on the new factory behavior.

patch from issue 967143002 at patchset 80001 (http://crrev.com/967143002#ps80001)

BUG=skia:

Review URL: https://codereview.chromium.org/967833003
This commit is contained in:
reed 2015-03-05 10:22:20 -08:00 committed by Commit bot
parent bca3c9fb2d
commit dac843bf04
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/effects/SkColorFilterImageFilter.cpp
View File

@ -21,10 +21,12 @@ SkColorFilterImageFilter* SkColorFilterImageFilter::Create(SkColorFilter* cf,
return NULL;
}
SkColorFilter* inputColorFilter;
if (input && input->asColorFilter(&inputColorFilter)) {
SkAutoUnref autoUnref(inputColorFilter);
SkAutoTUnref<SkColorFilter> newCF(cf->newComposed(inputColorFilter));
SkColorFilter* inputCF;
if (input && input->asColorFilter(&inputCF)) {
// This is an optimization, as it collapses the hierarchy by just combining the two
// colorfilters into a single one, which the new imagefilter will wrap.
SkAutoUnref autoUnref(inputCF);
SkAutoTUnref<SkColorFilter> newCF(SkColorFilter::CreateComposeFilter(cf, inputCF));
if (newCF) {
return SkNEW_ARGS(SkColorFilterImageFilter, (newCF, input->getInput(0), cropRect, 0));
}
@ -86,10 +88,13 @@ bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& sourc
}
bool SkColorFilterImageFilter::asColorFilter(SkColorFilter** filter) const {
if (!cropRectIsSet()) {
if (!this->cropRectIsSet()) {
SkASSERT(1 == this->countInputs());
// Since our factory has already performed the collapse optimization, we can assert that
// if we have an input, it is *not* also a colorfilter.
SkASSERT(!this->getInput(0) || !this->getInput(0)->asColorFilter(NULL));
if (filter) {
*filter = fColorFilter;
fColorFilter->ref();
*filter = SkRef(fColorFilter);
}
return true;
}

35
tests/ImageFilterTest.cpp
View File

@ -133,7 +133,7 @@ static SkImageFilter* make_scale(float amount, SkImageFilter* input = NULL) {
return SkColorFilterImageFilter::Create(filter, input);
}
static SkImageFilter* make_grayscale(SkImageFilter* input = NULL, const SkImageFilter::CropRect* cropRect = NULL) {
static SkImageFilter* make_grayscale(SkImageFilter* input, const SkImageFilter::CropRect* cropRect) {
SkScalar matrix[20];
memset(matrix, 0, 20 * sizeof(SkScalar));
matrix[0] = matrix[5] = matrix[10] = 0.2126f;
@ -144,28 +144,51 @@ static SkImageFilter* make_grayscale(SkImageFilter* input = NULL, const SkImageF
return SkColorFilterImageFilter::Create(filter, input, cropRect);
}
static SkImageFilter* make_blue(SkImageFilter* input, const SkImageFilter::CropRect* cropRect) {
SkAutoTUnref<SkColorFilter> filter(SkColorFilter::CreateModeFilter(SK_ColorBLUE,
SkXfermode::kSrcIn_Mode));
return SkColorFilterImageFilter::Create(filter, input, cropRect);
}
DEF_TEST(ImageFilter, reporter) {
{
// Check that two non-clipping color matrices concatenate into a single filter.
// Check that two non-clipping color-matrice-filters concatenate into a single filter.
SkAutoTUnref<SkImageFilter> halfBrightness(make_scale(0.5f));
SkAutoTUnref<SkImageFilter> quarterBrightness(make_scale(0.5f, halfBrightness));
REPORTER_ASSERT(reporter, NULL == quarterBrightness->getInput(0));
SkColorFilter* cf;
REPORTER_ASSERT(reporter, quarterBrightness->asColorFilter(&cf));
REPORTER_ASSERT(reporter, cf->asColorMatrix(NULL));
cf->unref();
}
{
// Check that a clipping color matrix followed by a grayscale does not concatenate into a single filter.
// Check that a clipping color-matrice-filter followed by a color-matrice-filters
// concatenates into a single filter, but not a matrixfilter (due to clamping).
SkAutoTUnref<SkImageFilter> doubleBrightness(make_scale(2.0f));
SkAutoTUnref<SkImageFilter> halfBrightness(make_scale(0.5f, doubleBrightness));
REPORTER_ASSERT(reporter, halfBrightness->getInput(0));
REPORTER_ASSERT(reporter, NULL == halfBrightness->getInput(0));
SkColorFilter* cf;
REPORTER_ASSERT(reporter, halfBrightness->asColorFilter(&cf));
REPORTER_ASSERT(reporter, !cf->asColorMatrix(NULL));
cf->unref();
}
{
// Check that a color filter image filter without a crop rect can be
// expressed as a color filter.
SkAutoTUnref<SkImageFilter> gray(make_grayscale());
SkAutoTUnref<SkImageFilter> gray(make_grayscale(NULL, NULL));
REPORTER_ASSERT(reporter, true == gray->asColorFilter(NULL));
}
{
// Check that a colorfilterimage filter without a crop rect but with an input
// that is another colorfilterimage can be expressed as a colorfilter (composed).
SkAutoTUnref<SkImageFilter> mode(make_blue(NULL, NULL));
SkAutoTUnref<SkImageFilter> gray(make_grayscale(mode, NULL));
REPORTER_ASSERT(reporter, true == gray->asColorFilter(NULL));
}
{
// Check that a color filter image filter with a crop rect cannot
// be expressed as a color filter.