Switch SkTileImageFilter over to new onFilterImage interface

src/effects/SkTileImageFilter.cpp

Index: src/effects/SkTileImageFilter.cpp
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp
index e6b561dec4d17b7470d9916a5da77af667a97518..2b97dd1e35dd31e8b03a51bf89493f723b56c0c4 100644
--- a/src/effects/SkTileImageFilter.cpp
+++ b/src/effects/SkTileImageFilter.cpp
@@ -6,16 +6,19 @@
  */
 
 #include "SkTileImageFilter.h"
-#include "SkBitmap.h"
+
 #include "SkCanvas.h"
-#include "SkDevice.h"
-#include "SkOffsetImageFilter.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
+#include "SkImage.h"
 #include "SkMatrix.h"
+#include "SkOffsetImageFilter.h"
 #include "SkPaint.h"
+#include "SkReadBuffer.h"
 #include "SkShader.h"
+#include "SkSpecialImage.h"
+#include "SkSpecialSurface.h"
+#include "SkSurface.h"
 #include "SkValidationUtils.h"
+#include "SkWriteBuffer.h"
 
 SkImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& dstRect,
                                          SkImageFilter* input) {
@@ -35,75 +38,86 @@ SkImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& ds
     return new SkTileImageFilter(srcRect, dstRect, input);
 }
 
-bool SkTileImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src,
-                                                const Context& ctx,
-                                                SkBitmap* dst, SkIPoint* offset) const {
-    SkBitmap source = src;
-    SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (!this->filterInputDeprecated(0, proxy, src, ctx, &source, &srcOffset)) {
-        return false;
+SkSpecialImage* SkTileImageFilter::onFilterImage(SkSpecialImage* source,
+                                                 const Context& ctx,
+                                                 SkIPoint* offset) const {
+    SkIPoint inputOffset = SkIPoint::Make(0, 0);
+    SkAutoTUnref<SkSpecialImage> input(this->filterInput(0, source, ctx, &inputOffset));
+    if (!input) {
+        return nullptr;
     }
 
     SkRect dstRect;
     ctx.ctm().mapRect(&dstRect, fDstRect);
     if (!dstRect.intersect(SkRect::Make(ctx.clipBounds()))) {
-        offset->fX = offset->fY = 0;
-        return true;
+        return nullptr;

[Stephen White, 2016/03/23 14:10:47]

As in some other filters, I'm concerned that we're losing the distinction
between "filter processing failed, abort" and "this node should output
transparent black". It seems we're losing that distinction, which could prove
problematic for downstream nodes which affect transparent black. Could we have
some kind of canonical transparent black SkSpecialImage we could return in the
latter case?

[robertphillips, 2016/03/25 16:22:45]

I have updated this site and the following one to replicate the prior behavior
(i.e., returning the unmodified source).

     }
     const SkIRect dstIRect = dstRect.roundOut();
-    int w = dstIRect.width();
-    int h = dstIRect.height();
-    if (!fSrcRect.width() || !fSrcRect.height() || !w || !h) {
-        return false;
+    int dstWidth = dstIRect.width();
+    int dstHeight = dstIRect.height();
+    if (!fSrcRect.width() || !fSrcRect.height() || !dstWidth || !dstHeight) {
+        return nullptr;
     }
 
     SkRect srcRect;
     ctx.ctm().mapRect(&srcRect, fSrcRect);
     SkIRect srcIRect;
     srcRect.roundOut(&srcIRect);
-    srcIRect.offset(-srcOffset);
-    SkBitmap subset;
-    SkIRect srcBounds;
-    source.getBounds(&srcBounds);
-
-    if (!SkIRect::Intersects(srcIRect, srcBounds)) {
-        offset->fX = offset->fY = 0;
-        return true;
+    srcIRect.offset(-inputOffset);
+    const SkIRect inputBounds = SkIRect::MakeWH(input->width(), input->height());
+
+    if (!SkIRect::Intersects(srcIRect, inputBounds)) {
+        return nullptr;
     }
-    if (srcBounds.contains(srcIRect)) {
-        if (!source.extractSubset(&subset, srcIRect)) {
-            return false;
+
+    // We create an SkImage here b.c. it needs to be a tight fit for the tiling
+    sk_sp<SkImage> subset;
+    if (inputBounds.contains(srcIRect)) {
+        subset = input->makeTightSubset(srcIRect);
+        if (!subset) {
+            return nullptr;
         }
     } else {
-        SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(srcIRect.width(),
-                                                              srcIRect.height(),
-                                                              kPossible_TileUsage));
-        if (!device) {
-            return false;
+        const SkImageInfo info = SkImageInfo::MakeN32(srcIRect.width(), srcIRect.height(),
+                                                      kPremul_SkAlphaType);
+        sk_sp<SkSurface> surf(input->makeTightSurface(info));
+        if (!surf) {
+            return nullptr;
         }
-        SkCanvas canvas(device);
-        canvas.drawBitmap(src, SkIntToScalar(srcOffset.x()),
-                               SkIntToScalar(srcOffset.y()));
-        subset = device->accessBitmap(false);
+
+        SkCanvas* canvas = surf->getCanvas();
+        SkASSERT(canvas);
+
+        SkPaint paint;
+        paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+
+        input->draw(canvas, 
+                    SkIntToScalar(inputOffset.x()), SkIntToScalar(inputOffset.y()),
+                    &paint);
+
+        subset = surf->makeImageSnapshot();
     }
-    SkASSERT(subset.width() == srcIRect.width());
-    SkASSERT(subset.height() == srcIRect.height());
+    SkASSERT(subset->width() == srcIRect.width());
+    SkASSERT(subset->height() == srcIRect.height());
+
+    const SkImageInfo info = SkImageInfo::MakeN32(dstWidth, dstHeight, kPremul_SkAlphaType);
 
-    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h));
-    if (nullptr == device.get()) {
-        return false;
+    sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
+    if (!surf) {
+        return nullptr;
     }
-    SkCanvas canvas(device);
+
+    SkCanvas* canvas = surf->getCanvas();
+    SkASSERT(canvas);
+
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-    paint.setShader(SkShader::MakeBitmapShader(subset, SkShader::kRepeat_TileMode,
-                                               SkShader::kRepeat_TileMode));
-    canvas.translate(-dstRect.fLeft, -dstRect.fTop);
-    canvas.drawRect(dstRect, paint);
-    *dst = device->accessBitmap(false);
+    paint.setShader(subset->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode));
+    canvas->translate(-dstRect.fLeft, -dstRect.fTop);
+    canvas->drawRect(dstRect, paint);
     offset->fX = dstIRect.fLeft;
     offset->fY = dstIRect.fTop;
-    return true;
+    return surf->makeImageSnapshot().release();
 }
 
 SkIRect SkTileImageFilter::onFilterNodeBounds(const SkIRect& src, const SkMatrix& ctm,