Make filters use SkImage instead of SkBitmap

include/effects/SkDisplacementMapEffect.h

Index: include/effects/SkDisplacementMapEffect.h
diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
index e55b324ce9da755c88ca95e590b8667f801adf19..952bcb4cd364173e37b328a6617dec458d86b419 100644
--- a/include/effects/SkDisplacementMapEffect.h
+++ b/include/effects/SkDisplacementMapEffect.h
@@ -9,7 +9,6 @@
 #define SkDisplacementMapEffect_DEFINED
 
 #include "SkImageFilter.h"
-#include "SkBitmap.h"
 
 class SK_API SkDisplacementMapEffect : public SkImageFilter {
 public:
@@ -33,9 +32,9 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)
 
     virtual bool onFilterImage(Proxy* proxy,
-                               const SkBitmap& src,
+                               SkImage& src,
                                const Context& ctx,
-                               SkBitmap* dst,
+                               SkAutoTUnref<SkImage>& dst,
                                SkIPoint* offset) const SK_OVERRIDE;
     void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
 
@@ -44,8 +43,8 @@ public:
 
 #if SK_SUPPORT_GPU
     bool canFilterImageGPU() const SK_OVERRIDE { return true; }
-    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
 
     SK_TO_STRING_OVERRIDE()