Make filters use SkImage instead of SkBitmap

src/effects/SkMatrixImageFilter.cpp

Index: src/effects/SkMatrixImageFilter.cpp
diff --git a/src/effects/SkMatrixImageFilter.cpp b/src/effects/SkMatrixImageFilter.cpp
index 4d9b1fa33517130f083500a31092c9125d88424d..3b47703d7a252d096c58b4b9919f98486cf4d457 100644
--- a/src/effects/SkMatrixImageFilter.cpp
+++ b/src/effects/SkMatrixImageFilter.cpp
@@ -49,19 +49,18 @@ SkMatrixImageFilter::~SkMatrixImageFilter() {
 }
 
 bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
-                                        const SkBitmap& source,
+                                        const SkImage* source,
                                         const Context& ctx,
-                                        SkBitmap* result,
+                                        SkAutoTUnref<const SkImage>& result,
                                         SkIPoint* offset) const {
-    SkBitmap src = source;
+    SkAutoTUnref<const SkImage> src(SkRef(source));
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, src, &srcOffset)) {
         return false;
     }
 
     SkRect dstRect;
-    SkIRect srcBounds, dstBounds;
-    src.getBounds(&srcBounds);
+    SkIRect srcBounds = SkIRect::MakeWH(src->width(), src->height());
     srcBounds.offset(srcOffset);
     SkRect srcRect = SkRect::Make(srcBounds);
     SkMatrix matrix;
@@ -71,6 +70,7 @@ bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
     matrix.postConcat(fTransform);
     matrix.postConcat(ctx.ctm());
     matrix.mapRect(&dstRect, srcRect);
+    SkIRect dstBounds;
     dstRect.roundOut(&dstBounds);
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstBounds.width(), dstBounds.height()));
@@ -85,9 +85,13 @@ bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
 
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setFilterLevel(fFilterLevel);
-    canvas.drawBitmap(src, srcRect.x(), srcRect.y(), &paint);
+    canvas.drawImage(src, srcRect.x(), srcRect.y(), &paint);
 
-    *result = device.get()->accessBitmap(false);
+    SkImage* image = device->newImageSnapshot();
+    if (NULL == image) {
+        return false;
+    }
+    result.reset(image);
     offset->fX = dstBounds.fLeft;
     offset->fY = dstBounds.fTop;
     return true;