Make filters use SkImage instead of SkBitmap

include/effects/SkDisplacementMapEffect.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDisplacementMapEffect_DEFINED
 #define SkDisplacementMapEffect_DEFINED
 
 #include "SkImageFilter.h"
-#include "SkBitmap.h"
 
 class SK_API SkDisplacementMapEffect : public SkImageFilter {
 public:
     enum ChannelSelectorType {
         kUnknown_ChannelSelectorType,
         kR_ChannelSelectorType,
         kG_ChannelSelectorType,
         kB_ChannelSelectorType,
         kA_ChannelSelectorType
     };
 
     ~SkDisplacementMapEffect();
 
     static SkDisplacementMapEffect* Create(ChannelSelectorType xChannelSelector,
                                            ChannelSelectorType yChannelSelector,
                                            SkScalar scale, SkImageFilter* displacement,
                                            SkImageFilter* color = NULL,
                                            const CropRect* cropRect = NULL,
                                            uint32_t uniqueID = 0);
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)
 
     virtual bool onFilterImage(Proxy* proxy,
-                               const SkBitmap& src,
+                               const SkImage* src,
                                const Context& ctx,
-                               SkBitmap* dst,
+                               SkAutoTUnref<const SkImage>& dst,
                                SkIPoint* offset) const SK_OVERRIDE;
     void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
 
     virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
                                 SkIRect* dst) const SK_OVERRIDE;
 
 #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, const SkImage* src, const Context& ctx,
+                                SkAutoTUnref<const SkImage>& result,
+                                SkIPoint* offset) const SK_OVERRIDE;
 #endif
 
     SK_TO_STRING_OVERRIDE()
 
 protected:
     SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
                             ChannelSelectorType yChannelSelector,
                             SkScalar scale, SkImageFilter* inputs[2],
                             const CropRect* cropRect,
                             uint32_t uniqueID);
     void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
 private:
     ChannelSelectorType fXChannelSelector;
     ChannelSelectorType fYChannelSelector;
     SkScalar fScale;
     typedef SkImageFilter INHERITED;
     const SkImageFilter* getDisplacementInput() const { return getInput(0); }
     const SkImageFilter* getColorInput() const { return getInput(1); }
 };
 
 #endif