Switch SkImageSource image filter over to new onFilterImage interface

src/effects/SkImageSource.cpp

Index: src/effects/SkImageSource.cpp
diff --git a/src/effects/SkImageSource.cpp b/src/effects/SkImageSource.cpp
index e9c98dc6ff71b2191cb5496ffc73529c4d22c214..86f2f048558a469602f5e07b5743e1bf13576485 100644
--- a/src/effects/SkImageSource.cpp
+++ b/src/effects/SkImageSource.cpp
@@ -8,9 +8,10 @@
 #include "SkImageSource.h"
 
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkImage.h"
 #include "SkReadBuffer.h"
+#include "SkSpecialImage.h"
+#include "SkSpecialSurface.h"
 #include "SkWriteBuffer.h"
 #include "SkString.h"
 
@@ -64,27 +65,38 @@ void SkImageSource::flatten(SkWriteBuffer& buffer) const {
     buffer.writeImage(fImage);
 }
 
-bool SkImageSource::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                            SkBitmap* result, SkIPoint* offset) const {
+SkSpecialImage* SkImageSource::onFilterImage(SkSpecialImage* src, const Context& ctx,
+                                             SkIPoint* offset) const {
     SkRect dstRect;
     ctx.ctm().mapRect(&dstRect, fDstRect);
+
     SkRect bounds = SkRect::MakeIWH(fImage->width(), fImage->height());
     if (fSrcRect == bounds && dstRect == bounds) {
         // No regions cropped out or resized; return entire image.
         offset->fX = offset->fY = 0;
-        return fImage->asLegacyBitmap(result, SkImage::kRO_LegacyBitmapMode);
+        return SkSpecialImage::NewFromImage(src->internal_getProxy(),

[Stephen White, 2016/03/07 21:47:26]

This seems unfortunate. I'm guessing we need the proxy here for downstream nodes
which still use the legacy path?

If we can't hide this ugly, could we make this a call to
NewFromImageDeprecated() instead, and add a TODO so we remember to circle back
and remove it?

[robertphillips, 2016/03/08 16:45:29]

It is unfortunate but we do need it for downstream legacy nodes.

If we did have a NewFromImage and NewFromImageDeprecated we should probably do
the same to the other two NewFrom* entry points. I don't think we're in any
danger of forgetting to remove the proxy when we're able to though.

[Stephen White, 2016/03/08 16:48:42]

Acknowledged.

+                                            SkIRect::MakeWH(fImage->width(), fImage->height()),
+                                            fImage);
     }
 
     const SkIRect dstIRect = dstRect.roundOut();
-    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstIRect.width(), dstIRect.height()));
-    if (nullptr == device.get()) {
-        return false;
+
+    const SkImageInfo info = SkImageInfo::MakeN32(dstIRect.width(), dstIRect.height(),
+                                                  kPremul_SkAlphaType);
+
+    SkAutoTUnref<SkSpecialSurface> surf(src->newSurface(info));
+    if (!surf) {
+        return nullptr;
     }
 
-    SkCanvas canvas(device.get());
+    SkCanvas* canvas = surf->getCanvas();
+    SkASSERT(canvas);
+
+    canvas->clear(0x0);
+
     SkPaint paint;
 
-    // Subtract off the integer component of the translation (will be applied in loc, below).
+    // Subtract off the integer component of the translation (will be applied in offset, below).
     dstRect.offset(-SkIntToScalar(dstIRect.fLeft), -SkIntToScalar(dstIRect.fTop));
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     // FIXME: this probably shouldn't be necessary, but drawImageRect asserts
@@ -92,13 +104,11 @@ bool SkImageSource::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src, c
     paint.setFilterQuality(
         fSrcRect.width() == dstRect.width() && fSrcRect.height() == dstRect.height() ?
                kNone_SkFilterQuality : fFilterQuality);
-    canvas.drawImageRect(fImage, fSrcRect, dstRect, &paint, SkCanvas::kStrict_SrcRectConstraint);
+    canvas->drawImageRect(fImage, fSrcRect, dstRect, &paint, SkCanvas::kStrict_SrcRectConstraint);
 
-    *result = device.get()->accessBitmap(false);
     offset->fX = dstIRect.fLeft;
     offset->fY = dstIRect.fTop;
-
-    return true;
+    return surf->newImageSnapshot();
 }
 
 void SkImageSource::computeFastBounds(const SkRect& src, SkRect* dst) const {