Make filters use SkImage instead of SkBitmap

include/effects/SkMorphologyImageFilter.h

Index: include/effects/SkMorphologyImageFilter.h
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index 901955bee61fdb548941aefcc31afdcb05068261..de9e260c796da73c271d38921fe586f8e42ef74e 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -32,13 +32,13 @@ protected:
     SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input,
                             const CropRect* cropRect, uint32_t uniqueID);
     bool filterImageGeneric(Proc procX, Proc procY,
-                            Proxy*, const SkBitmap& src, const Context&,
-                            SkBitmap* result, SkIPoint* offset) const;
+                            Proxy*, const SkImage* src, const Context&,
+                            SkAutoTUnref<const SkImage>& result, SkIPoint* offset) const;
     void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 #if SK_SUPPORT_GPU
     bool canFilterImageGPU() const SK_OVERRIDE { return true; }
-    bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkBitmap& src,
-                               const Context& ctm, SkBitmap* result,
+    bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkImage* src,
+                               const Context& ctm, SkAutoTUnref<const SkImage>& result,
                                SkIPoint* offset) const;
 #endif
 
@@ -61,11 +61,13 @@ public:
         return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect, uniqueID));
     }
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    virtual bool onFilterImage(Proxy*, const SkImage* src, const Context&,
+                               SkAutoTUnref<const SkImage>& result,
+                               SkIPoint* offset) const SK_OVERRIDE;
 #if SK_SUPPORT_GPU
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    virtual bool filterImageGPU(Proxy* proxy, const SkImage* src, const Context&,
+                                SkAutoTUnref<const SkImage>& result,
+                                SkIPoint* offset) const SK_OVERRIDE;
 #endif
 
     SK_TO_STRING_OVERRIDE()
@@ -90,11 +92,13 @@ public:
         return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect, uniqueID));
     }
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    virtual bool onFilterImage(Proxy*, const SkImage* src, const Context&,
+                               SkAutoTUnref<const SkImage>& result,
+                               SkIPoint* offset) const SK_OVERRIDE;
 #if SK_SUPPORT_GPU
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    virtual bool filterImageGPU(Proxy* proxy, const SkImage* src, const Context&,
+                                SkAutoTUnref<const SkImage>& result,
+                                SkIPoint* offset) const SK_OVERRIDE;
 #endif
 
     SK_TO_STRING_OVERRIDE()