Switch SkOffsetImageFilter over to new onFilterImage interface

src/effects/SkOffsetImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOffsetImageFilter.h"
-#include "SkBitmap.h"
+
 #include "SkCanvas.h"
-#include "SkDevice.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
+#include "SkReadBuffer.h"
+#include "SkSpecialImage.h"
+#include "SkSpecialSurface.h"
+#include "SkWriteBuffer.h"
 
-bool SkOffsetImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& source,
-                                                  const Context& ctx,
-                                                  SkBitmap* result,
-                                                  SkIPoint* offset) const {
-    SkBitmap src = source;
+SkSpecialImage* SkOffsetImageFilter::onFilterImage(SkSpecialImage* srcIn,
+                                                   const Context& ctx,
+                                                   SkIPoint* offset) const {
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (!cropRectIsSet()) {
-        if (!this->filterInputDeprecated(0, proxy, source, ctx, &src, &srcOffset)) {
-            return false;
-        }
+    SkAutoTUnref<SkSpecialImage> src(this->filterInput(0, srcIn, ctx, &srcOffset));
+    if (!src) {
+        return nullptr;
+    }
 
-        SkVector vec;
-        ctx.ctm().mapVectors(&vec, &fOffset, 1);
+    SkVector vec;
+    ctx.ctm().mapVectors(&vec, &fOffset, 1);
 
+    if (!this->cropRectIsSet()) {
         offset->fX = srcOffset.fX + SkScalarRoundToInt(vec.fX);
         offset->fY = srcOffset.fY + SkScalarRoundToInt(vec.fY);
-        *result = src;
+        return src.release();
     } else {
-        if (!this->filterInputDeprecated(0, proxy, source, ctx, &src, &srcOffset)) {
-            return false;
-        }
-
         SkIRect bounds;
-        SkIRect srcBounds = src.bounds();
+        SkIRect srcBounds = SkIRect::MakeWH(srcIn->width(), srcIn->height());

[Stephen White, 2016/03/07 18:52:04]

I don't think this is correct. I think we should be using src's width and height
here, not srcIn's.

Also, let's standardize on calling the passed-in parameter "source" (instead of
srcIn or src), and the local variable "input" (instead of src), since it's the
input to this node.

[robertphillips, 2016/03/08 14:56:25]

Done.

         srcBounds.offset(srcOffset);
         if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
             return false;
         }
 
-        SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-        if (nullptr == device.get()) {
-            return false;
+        SkImageInfo info = SkImageInfo::MakeN32(bounds.width(), bounds.height(),
+                                                kPremul_SkAlphaType);
+        SkAutoTUnref<SkSpecialSurface> surf(src->newSurface(info));
+        if (!surf) {
+            return nullptr;
         }
-        SkCanvas canvas(device);
+
+        SkCanvas* canvas = surf->getCanvas();
+        SkASSERT(canvas);
+
+        canvas->clear(0x0);

[Stephen White, 2016/03/07 18:52:04]

It seems surprising to me that we always have to clear the canvas where we
didn't before. Isn't this implicit in surface creation or something?

[robertphillips, 2016/03/08 14:56:25]

The SkDevice used to do it for us. Hopefully we can exploit it being broken out
now in some of the effects that don't need it.

+
         SkPaint paint;
         paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-        canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
-                         SkIntToScalar(srcOffset.fY - bounds.fTop));
-        SkVector vec;
-        ctx.ctm().mapVectors(&vec, &fOffset, 1);
-        canvas.drawBitmap(src, vec.x(), vec.y(), &paint);
-        *result = device->accessBitmap(false);
+        canvas->translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
+                          SkIntToScalar(srcOffset.fY - bounds.fTop));
+
+        src->draw(canvas, vec.x(), vec.y(), &paint);
+
         offset->fX = bounds.fLeft;
         offset->fY = bounds.fTop;
+        return surf->newImageSnapshot();
     }
-    return true;
 }
 
 void SkOffsetImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     if (getInput(0)) {
         getInput(0)->computeFastBounds(src, dst);
     } else {
         *dst = src;
     }
     dst->offset(fOffset.fX, fOffset.fY);
 }
@@ skipping 32 matching lines @@
 void SkOffsetImageFilter::toString(SkString* str) const {
     str->appendf("SkOffsetImageFilter: (");
     str->appendf("offset: (%f, %f) ", fOffset.fX, fOffset.fY);
     str->append("input: (");
     if (this->getInput(0)) {
         this->getInput(0)->toString(str);
     }
     str->append("))");
 }
 #endif