Revert conversion of SkColorFilterImageFilter to new API
BUG=598028
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1864263002
Review URL: https://codereview.chromium.org/1864263002
diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h
index 5ed051c..2aa04d1 100644
--- a/include/effects/SkColorFilterImageFilter.h
+++ b/include/effects/SkColorFilterImageFilter.h
@@ -33,8 +33,8 @@
protected:
void flatten(SkWriteBuffer&) const override;
- sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
- SkIPoint* offset) const override;
+ bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+ SkIPoint* loc) const override;
bool onIsColorFilterNode(SkColorFilter**) const override;
bool affectsTransparentBlack() const override;
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp
index 8d412cc..63dded6 100644
--- a/src/effects/SkColorFilterImageFilter.cpp
+++ b/src/effects/SkColorFilterImageFilter.cpp
@@ -9,9 +9,8 @@
#include "SkCanvas.h"
#include "SkColorFilter.h"
+#include "SkDevice.h"
#include "SkReadBuffer.h"
-#include "SkSpecialImage.h"
-#include "SkSpecialSurface.h"
#include "SkWriteBuffer.h"
sk_sp<SkImageFilter> SkColorFilterImageFilter::Make(sk_sp<SkColorFilter> cf,
@@ -57,62 +56,55 @@
buffer.writeFlattenable(fColorFilter.get());
}
-sk_sp<SkSpecialImage> SkColorFilterImageFilter::onFilterImage(SkSpecialImage* source,
- const Context& ctx,
- SkIPoint* offset) const {
- SkIPoint inputOffset = SkIPoint::Make(0, 0);
- sk_sp<SkSpecialImage> input(this->filterInput(0, source, ctx, &inputOffset));
+bool SkColorFilterImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& source,
+ const Context& ctx,
+ SkBitmap* result,
+ SkIPoint* offset) const {
+ SkBitmap src = source;
+ SkIPoint srcOffset = SkIPoint::Make(0, 0);
+ bool inputResult = this->filterInputDeprecated(0, proxy, source, ctx, &src, &srcOffset);
- SkIRect inputBounds;
+ SkIRect srcBounds;
+
if (fColorFilter->affectsTransparentBlack()) {
// If the color filter affects transparent black, the bounds are the entire clip.
- inputBounds = ctx.clipBounds();
- } else if (!input) {
- return nullptr;
+ srcBounds = ctx.clipBounds();
+ } else if (!inputResult) {
+ return false;
} else {
- inputBounds = SkIRect::MakeXYWH(inputOffset.x(), inputOffset.y(),
- input->width(), input->height());
+ srcBounds = src.bounds();
+ srcBounds.offset(srcOffset);
}
SkIRect bounds;
- if (!this->applyCropRect(ctx, inputBounds, &bounds)) {
- return nullptr;
+ if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
+ return false;
}
- SkImageInfo info = SkImageInfo::MakeN32(bounds.width(), bounds.height(), kPremul_SkAlphaType);
- sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
- if (!surf) {
- return nullptr;
+ SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+ if (nullptr == device.get()) {
+ return false;
}
-
- SkCanvas* canvas = surf->getCanvas();
- SkASSERT(canvas);
+ SkCanvas canvas(device.get());
SkPaint paint;
-
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
paint.setColorFilter(fColorFilter);
// TODO: it may not be necessary to clear or drawPaint inside the input bounds
// (see skbug.com/5075)
if (fColorFilter->affectsTransparentBlack()) {
- // The subsequent input->draw() call may not fill the entire canvas. For filters which
+ // The subsequent drawBitmap call may not fill the entire canvas. For filters which
// affect transparent black, ensure that the filter is applied everywhere.
- canvas->drawPaint(paint);
- } else {
- canvas->clear(0x0);
+ canvas.drawPaint(paint);
}
- if (input) {
- input->draw(canvas,
- SkIntToScalar(inputOffset.fX - bounds.fLeft),
- SkIntToScalar(inputOffset.fY - bounds.fTop),
- &paint);
- }
-
+ canvas.drawBitmap(src, SkIntToScalar(srcOffset.fX - bounds.fLeft),
+ SkIntToScalar(srcOffset.fY - bounds.fTop), &paint);
+ *result = device.get()->accessBitmap(false);
offset->fX = bounds.fLeft;
offset->fY = bounds.fTop;
- return surf->makeImageSnapshot();
+ return true;
}
bool SkColorFilterImageFilter::onIsColorFilterNode(SkColorFilter** filter) const {