Make filters use SkImage instead of SkBitmap

src/effects/SkRectShaderImageFilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRectShaderImageFilter.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
+#include "SkSurface.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkShader.h"
 
 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) {
     SkASSERT(s);
     uint32_t flags = CropRect::kHasAll_CropEdge;
     if (rect.width() == 0 || rect.height() == 0) {
         flags = 0x0;
     }
@@ skipping 21 matching lines @@
 void SkRectShaderImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeFlattenable(fShader);
 }
 
 SkRectShaderImageFilter::~SkRectShaderImageFilter() {
     fShader->unref();
 }
 
 bool SkRectShaderImageFilter::onFilterImage(Proxy* proxy,
-                                            const SkBitmap& source,
+                                            SkImage& source,
                                             const Context& ctx,
-                                            SkBitmap* result,
+                                            SkAutoTUnref<SkImage>& result,
                                             SkIPoint* offset) const {
     SkIRect bounds;
     if (!this->applyCropRect(ctx, source, SkIPoint::Make(0, 0), &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) {
         return false;
     }
-    SkCanvas canvas(device.get());
 
     SkPaint paint;
     SkMatrix matrix(ctx.ctm());
     matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
     SkSafeUnref(paint.setShader(SkShader::CreateLocalMatrixShader(fShader, matrix)));
 
     SkRect rect = SkRect::MakeWH(SkIntToScalar(bounds.width()), SkIntToScalar(bounds.height()));
-    canvas.drawRect(rect, paint);
+    surface->getCanvas()->drawRect(rect, paint);
 
-    *result = device.get()->accessBitmap(false);
+    SkImage* image = surface->newImageSnapshot(SkSurface::kYes_Budgeted);
+    if (NULL == image) {
+        return false;
+    }
+    result.reset(image);
+
     offset->fX = bounds.fLeft;
     offset->fY = bounds.fTop;
     return true;
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkRectShaderImageFilter::toString(SkString* str) const {
     str->appendf("SkRectShaderImageFilter: (");
     str->append(")");
 }
 #endif