Make filters use SkImage instead of SkBitmap

src/effects/SkMergeImageFilter.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 "SkMergeImageFilter.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ skipping 37 matching lines @@
     this->initModes(modes);
 }
 
 SkMergeImageFilter::~SkMergeImageFilter() {
 
     if (fModes != SkTCast<uint8_t*>(fStorage)) {
         sk_free(fModes);
     }
 }
 
-bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
+bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkImage* src,
                                        const Context& ctx,
-                                       SkBitmap* result, SkIPoint* offset) const {
+                                       SkAutoTUnref<const SkImage>& result,
+                                       SkIPoint* offset) const {
     if (countInputs() < 1) {
         return false;
     }
 
     SkIRect bounds;
     if (!this->applyCropRect(ctx, src, SkIPoint::Make(0, 0), &bounds)) {
         return false;
     }
 
     const int x0 = bounds.left();
     const int y0 = bounds.top();
 
     SkAutoTUnref<SkBaseDevice> dst(proxy->createDevice(bounds.width(), bounds.height()));
     if (NULL == dst) {
         return false;
     }
     SkCanvas canvas(dst);
     SkPaint paint;
 
     int inputCount = countInputs();
     for (int i = 0; i < inputCount; ++i) {
-        SkBitmap tmp;
-        const SkBitmap* srcPtr;
+        SkAutoTUnref<const SkImage> filteredImage(SkRef(src));
         SkIPoint pos = SkIPoint::Make(0, 0);
         SkImageFilter* filter = getInput(i);
-        if (filter) {
-            if (!filter->filterImage(proxy, src, ctx, &tmp, &pos)) {
-                return false;
-            }
-            srcPtr = &tmp;
-        } else {
-            srcPtr = &src;
+        if (filter && !filter->filterImage(proxy, src, ctx, filteredImage, &pos)) {
+            return false;
         }
 
         if (fModes) {
             paint.setXfermodeMode((SkXfermode::Mode)fModes[i]);
         } else {
             paint.setXfermode(NULL);
         }
-        canvas.drawSprite(*srcPtr, pos.x() - x0, pos.y() - y0, &paint);
+        canvas.drawImageAsSprite(*filteredImage, pos.x() - x0, pos.y() - y0, &paint);
     }
-
+    SkImage* image = dst->newImageSnapshot();
+    if (NULL == image) {
+        return false;
+    }
+    result.reset(image);
     offset->fX = bounds.left();
     offset->fY = bounds.top();
-    *result = dst->accessBitmap(false);
     return true;
 }
 
 SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) {
     Common common;
     if (!common.unflatten(buffer, -1)) {
         return NULL;
     }
 
     const int count = common.inputCount();
@@ skipping 31 matching lines @@
     for (int i = 0; i < this->countInputs(); ++i) {
         SkImageFilter* filter = this->getInput(i);
         str->appendf("%d: (", i);
         filter->toString(str);
         str->appendf(")");
     }
 
     str->append(")");
 }
 #endif