Make filters use SkImage instead of SkBitmap

src/effects/SkColorFilterImageFilter.cpp

Index: src/effects/SkColorFilterImageFilter.cpp
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp
index 2eb720e5c4cfcf093f815522af66e2839ebfb04e..d553f67e92802d2307766220ef09dbc695e53fb7 100755
--- a/src/effects/SkColorFilterImageFilter.cpp
+++ b/src/effects/SkColorFilterImageFilter.cpp
@@ -55,13 +55,13 @@ SkColorFilterImageFilter::~SkColorFilterImageFilter() {
     fColorFilter->unref();
 }
 
-bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
+bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, 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;
     }
 
@@ -79,9 +79,13 @@ bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& sourc
 
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setColorFilter(fColorFilter);
-    canvas.drawSprite(src, srcOffset.fX - bounds.fLeft, srcOffset.fY - bounds.fTop, &paint);
+    canvas.drawImageAsSprite(*src, srcOffset.fX - bounds.fLeft, srcOffset.fY - bounds.fTop, &paint);
+    SkImage* image = device->newImageSnapshot();
+    if (NULL == image) {
+        return false;
+    }
+    result.reset(image);
 
-    *result = device.get()->accessBitmap(false);
     offset->fX = bounds.fLeft;
     offset->fY = bounds.fTop;
     return true;