Make filters use SkImage instead of SkBitmap

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"
 
-bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
+bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkImage* source,
                                         const Context& ctx,
-                                        SkBitmap* result,
+                                        SkAutoTUnref<const SkImage>& result,
                                         SkIPoint* offset) const {
     SkImageFilter* input = getInput(0);
-    SkBitmap src = source;
+    SkAutoTUnref<const 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;
         }
 
         SkVector vec;
         ctx.ctm().mapVectors(&vec, &fOffset, 1);
 
         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)) {
             return false;
         }
 
         SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
         if (NULL == device.get()) {
             return false;
         }
         SkCanvas canvas(device);
         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.drawImage(src, vec.x(), vec.y(), &paint);
+        SkImage* image = device->newImageSnapshot();
+        if (NULL == image) {
+            return false;
+        }
+        result.reset(image);
+
         offset->fX = bounds.fLeft;
         offset->fY = bounds.fTop;
     }
     return true;
 }
 
 void SkOffsetImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     if (getInput(0)) {
         getInput(0)->computeFastBounds(src, dst);
     } else {
@@ skipping 41 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