Make filters use SkImage instead of SkBitmap

gm/imagefiltersgraph.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkArithmeticMode.h"
-#include "SkDevice.h"
+#include "SkSurface.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkMergeImageFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkTestImageFilters.h"
 #include "SkXfermodeImageFilter.h"
 
 // More closely models how Blink's OffsetFilter works as of 10/23/13. SkOffsetImageFilter doesn't
 // perform a draw and this one does.
 class SimpleOffsetFilter : public SkImageFilter {
 public:
     class Registrar {
     public:
         Registrar() {
             SkFlattenable::Register("SimpleOffsetFilter",
                                     SimpleOffsetFilter::CreateProc,
                                     SimpleOffsetFilter::GetFlattenableType());
         }
     };
     static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkImageFilter* input) {
         return SkNEW_ARGS(SimpleOffsetFilter, (dx, dy, input));
     }
 
-    virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                               SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE {
-        SkBitmap source = src;
+    virtual bool onFilterImage(Proxy* proxy, SkImage& src, const Context& ctx,
+                               SkAutoTUnref<SkImage>& dst, SkIPoint* offset) const SK_OVERRIDE {
+        SkAutoTUnref<SkImage> source(SkRef(&src));
         SkImageFilter* input = getInput(0);
         SkIPoint srcOffset = SkIPoint::Make(0, 0);
-        if (input && !input->filterImage(proxy, src, ctx, &source, &srcOffset)) {
+        if (input && !input->filterImage(proxy, src, ctx, source, &srcOffset)) {
             return false;
         }
 
         SkIRect bounds;
-        if (!this->applyCropRect(ctx, proxy, source, &srcOffset, &bounds, &source)) {
+        if (!this->applyCropRect(ctx, proxy, *source, &srcOffset, &bounds, source)) {
             return false;
         }
 
-        SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-        SkCanvas canvas(device);
+        SkAutoTUnref<SkSurface> surface(proxy->createSurface(bounds.width(), bounds.height()));
+        SkCanvas* canvas = surface->getCanvas();
         SkPaint paint;
         paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-        canvas.drawBitmap(source, fDX - bounds.left(), fDY - bounds.top(), &paint);
-        *dst = device->accessBitmap(false);
+        canvas->drawImage(source, fDX - bounds.left(), fDY - bounds.top(), &paint);
+        SkImage* image = surface->newImageSnapshot(SkSurface::kYes_Budgeted);
+        if (NULL == image) {
+            return false;
+        }
+        dst.reset(image);
         offset->fX += bounds.left();
         offset->fY += bounds.top();
         return true;
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SimpleOffsetFilter);
 
 protected:
     void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
@@ skipping 154 matching lines @@
 
 private:
     typedef GM INHERITED;
     SkBitmap fBitmap;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersGraphGM; }
 static skiagm::GMRegistry reg(MyFactory);