Make filters use SkImage instead of SkBitmap

include/effects/SkPictureImageFilter.h

Index: include/effects/SkPictureImageFilter.h
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index e6579eabe7a7fe8ddbacdacb7c4b9eef624671b1..65ba2434b6e42b014170793fbbc495177a8c87ca 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -66,15 +66,15 @@ protected:
      *  @param SkReadBuffer Serialized picture data.
      */
     void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    virtual bool onFilterImage(Proxy*, SkImage& src, const Context&,
+                               SkAutoTUnref<SkImage>& result, SkIPoint* offset) const SK_OVERRIDE;
 
 private:
 
 
-    void drawPictureAtDeviceResolution(Proxy*, SkBaseDevice*, const SkIRect& deviceBounds,
+    void drawPictureAtSurfaceResolution(Proxy*, SkSurface*, const SkIRect& surfaceBounds,
                                        const Context&) const;
-    void drawPictureAtLocalResolution(Proxy*, SkBaseDevice*, const SkIRect& deviceBounds,
+    void drawPictureAtLocalResolution(Proxy*, SkSurface*, const SkIRect& surfaceBounds,
                                       const Context&) const;
 
     const SkPicture*      fPicture;