Make filters use SkImage instead of SkBitmap

include/effects/SkXfermodeImageFilter.h

Index: include/effects/SkXfermodeImageFilter.h
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h
index 47c44b87e1983b45e48c035027efd99579fa833e..2bf4faf40c1fff6bce7f9519b65ffd241b6f407d 100644
--- a/include/effects/SkXfermodeImageFilter.h
+++ b/include/effects/SkXfermodeImageFilter.h
@@ -10,7 +10,6 @@
 
 #include "SkImageFilter.h"
 
-class SkBitmap;
 class SkXfermode;
 
 class SK_API SkXfermodeImageFilter : public SkImageFilter {
@@ -35,14 +34,14 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter)
 
     virtual bool onFilterImage(Proxy* proxy,
-                               const SkBitmap& src,
+                               SkImage& src,
                                const Context& ctx,
-                               SkBitmap* dst,
+                               SkAutoTUnref<SkImage>& dst,
                                SkIPoint* offset) const SK_OVERRIDE;
 #if SK_SUPPORT_GPU
     bool canFilterImageGPU() const SK_OVERRIDE;
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    virtual bool filterImageGPU(Proxy* proxy, SkImage& src, const Context& ctx,
+                                SkAutoTUnref<SkImage>& result, SkIPoint* offset) const SK_OVERRIDE;
 #endif
 
 protected: