Make filters use SkImage instead of SkBitmap

src/effects/SkOffsetImageFilter.cpp

Index: src/effects/SkOffsetImageFilter.cpp
diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp
index 8a17ce34ec7b7c1320494e02e5db97ffb4dc91ad..ba3c8d01c37e54e22c8176807c4f86a1ff67eba4 100644
--- a/src/effects/SkOffsetImageFilter.cpp
+++ b/src/effects/SkOffsetImageFilter.cpp
@@ -8,25 +8,25 @@
 #include "SkOffsetImageFilter.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
+#include "SkSurface.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 
-bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
+bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, SkImage& source,
                                         const Context& ctx,
-                                        SkBitmap* result,
+                                        SkAutoTUnref<SkImage>& result,
                                         SkIPoint* offset) const {
     SkImageFilter* input = getInput(0);
-    SkBitmap src = source;
+    SkAutoTUnref<SkImage> src(SkRef(&source));
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
 #ifdef SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION
     if (false) {
 #else
     if (!cropRectIsSet()) {
 #endif
-        if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+        if (input && !input->filterImage(proxy, source, ctx, src, &srcOffset)) {
             return false;
         }
 
@@ -35,30 +35,35 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
 
         offset->fX = srcOffset.fX + SkScalarRoundToInt(vec.fX);
         offset->fY = srcOffset.fY + SkScalarRoundToInt(vec.fY);
-        *result = src;
+        result.swap(&src);
     } else {
-        if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+        if (input && !input->filterImage(proxy, source, ctx, src, &srcOffset)) {
             return false;
         }
 
         SkIRect bounds;
-        if (!this->applyCropRect(ctx, src, srcOffset, &bounds)) {
+        if (!this->applyCropRect(ctx, *src, srcOffset, &bounds)) {
             return false;
         }
 
-        SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-        if (NULL == device.get()) {
+        SkAutoTUnref<SkSurface> surface(proxy->createSurface(bounds.width(), bounds.height()));
+        if (NULL == surface.get()) {
             return false;
         }
-        SkCanvas canvas(device);
+        SkCanvas* canvas = surface->getCanvas();
         SkPaint paint;
         paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-        canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
+        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->drawImage(src, vec.x(), vec.y(), &paint);
+        SkImage* image = surface->newImageSnapshot(SkSurface::kYes_Budgeted);
+        if (NULL == image) {
+            return false;
+        }
+        result.reset(image);
+
         offset->fX = bounds.fLeft;
         offset->fY = bounds.fTop;
     }