Make filters use SkImage instead of SkBitmap

include/effects/SkMatrixConvolutionImageFilter.h

Index: include/effects/SkMatrixConvolutionImageFilter.h
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h
index 327f98f13974c4568d6f8bcc762c4271824a3d0b..791d29f1c63a2bb92dac1c22a001221325b67160 100644
--- a/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/include/effects/SkMatrixConvolutionImageFilter.h
@@ -13,6 +13,8 @@
 #include "SkSize.h"
 #include "SkPoint.h"
 
+class SkBitmap;
+
 /*! \class SkMatrixConvolutionImageFilter
     Matrix convolution image filter.  This filter applies an NxM image
     processing kernel to a given input image.  This can be used to produce
@@ -79,8 +81,8 @@ protected:
                                    uint32_t uniqueID);
     void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
+    virtual bool onFilterImage(Proxy*, SkImage& src, const Context&,
+                               SkAutoTUnref<SkImage>& result, SkIPoint* loc) const SK_OVERRIDE;
     bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;