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

remove unused variants in imagefilter factories

Browse Source 
Bug: skia:
Change-Id: Ife12bfa1c16f9dd87b24f73d3b260b0d2f46c7df
Reviewed-on: https://skia-review.googlesource.com/20207
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2017-06-18 21:32:48 -04:00 committed by Skia Commit-Bot
parent d72b55b32c
commit 6b9cd051b4
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gm/arithmode.cpp
View File

@ -138,7 +138,8 @@ protected:
canvas->translate(gap, 0);
sk_sp<SkImageFilter> bg =
SkArithmeticImageFilter::Make(0, 0, -one / 2, 1, enforcePMColor, dstFilter);
SkArithmeticImageFilter::Make(0, 0, -one / 2, 1, enforcePMColor, dstFilter,
nullptr, nullptr);
SkPaint p;
p.setImageFilter(SkArithmeticImageFilter::Make(0, one / 2, -one, 1, true,
std::move(bg), dstFilter, nullptr));

3
gm/xfermodeimagefilter.cpp
View File

@ -93,7 +93,8 @@ protected:
}
}
// Test arithmetic mode as image filter
paint.setImageFilter(SkArithmeticImageFilter::Make(0, 1, 1, 0, true, background));
paint.setImageFilter(SkArithmeticImageFilter::Make(0, 1, 1, 0, true, background,
nullptr, nullptr));
DrawClippedBitmap(canvas, fBitmap, paint, x, y);
x += fBitmap.width() + MARGIN;
if (x + fBitmap.width() > WIDTH) {

4
include/effects/SkArithmeticImageFilter.h
View File

@ -16,10 +16,6 @@ public:
sk_sp<SkImageFilter> background,
sk_sp<SkImageFilter> foreground,
const SkImageFilter::CropRect* cropRect);
static sk_sp<SkImageFilter> Make(float k1, float k2, float k3, float k4, bool enforcePMColor,
sk_sp<SkImageFilter> background) {
return Make(k1, k2, k3, k4, enforcePMColor, std::move(background), nullptr, nullptr);
}
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();

8
include/effects/SkXfermodeImageFilter.h
View File

@ -25,8 +25,7 @@ public:
return Make(mode, std::move(background), nullptr, nullptr);
}
// Arithmetic image filtering used to be implemented using SkXfermode. Some clients still rely
// on these factories existing in this class.
// Need to update chrome to use SkArithmeticImageFilter instead...
static sk_sp<SkImageFilter> MakeArithmetic(float k1, float k2, float k3, float k4,
bool enforcePMColor, sk_sp<SkImageFilter> background,
sk_sp<SkImageFilter> foreground,
@ -34,11 +33,6 @@ public:
return SkArithmeticImageFilter::Make(k1, k2, k3, k4, enforcePMColor, std::move(background),
std::move(foreground), cropRect);
}
static sk_sp<SkImageFilter> MakeArithmetic(float k1, float k2, float k3, float k4,
bool enforcePMColor,
sk_sp<SkImageFilter> background) {
return SkArithmeticImageFilter::Make(k1, k2, k3, k4, enforcePMColor, std::move(background));
}
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP();