Make filters use SkImage instead of SkBitmap

gm/imagefiltersbase.cpp

 /*
  * Copyright 2011 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 "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
+#include "SkColorFilterImageFilter.h"
 #include "SkColorPriv.h"
+#include "SkDropShadowImageFilter.h"
+#include "SkImage.h"
 #include "SkShader.h"
-
-#include "SkBlurImageFilter.h"
-#include "SkColorFilterImageFilter.h"
-#include "SkDropShadowImageFilter.h"
 #include "SkTestImageFilters.h"
 
 class FailImageFilter : public SkImageFilter {
 public:
     class Registrar {
     public:
         Registrar() {
             SkFlattenable::Register("FailImageFilter",
                                     FailImageFilter::CreateProc,
                                     FailImageFilter::GetFlattenableType());
         }
     };
     static FailImageFilter* Create() {
         return SkNEW(FailImageFilter);
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
 
 protected:
     FailImageFilter() : INHERITED(0, NULL) {}
 
-    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                       SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
+    bool onFilterImage(Proxy*, const SkImage* src, const Context&,
+                       SkAutoTUnref<const SkImage>& result, SkIPoint* offset) const SK_OVERRIDE {
         return false;
     }
 
 private:
     typedef SkImageFilter INHERITED;
 };
 
 static FailImageFilter::Registrar gReg0;
 
 SkFlattenable* FailImageFilter::CreateProc(SkReadBuffer& buffer) {
@@ skipping 20 matching lines @@
     };
     static IdentityImageFilter* Create(SkImageFilter* input = NULL) {
         return SkNEW_ARGS(IdentityImageFilter, (input));
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
 protected:
     IdentityImageFilter(SkImageFilter* input) : INHERITED(1, &input) {}
 
-    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                       SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
-        *result = src;
+    bool onFilterImage(Proxy*, const SkImage* src, const Context&,
+                       SkAutoTUnref<const SkImage>& result, SkIPoint* offset) const SK_OVERRIDE {
+        result.reset(SkRef(src));
         offset->set(0, 0);
         return true;
     }
 
 private:
     typedef SkImageFilter INHERITED;
 };
 
 static IdentityImageFilter::Registrar gReg1;
 
@@ skipping 246 matching lines @@
 class ImageFiltersText_CF : public ImageFiltersTextBaseGM {
 public:
     ImageFiltersText_CF() : ImageFiltersTextBaseGM("color") {}
 
     void installFilter(SkPaint* paint) SK_OVERRIDE {
         paint->setColorFilter(SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode))->unref();
     }
 };
 DEF_GM( return new ImageFiltersText_CF; )