Make filters use SkImage instead of SkBitmap

include/effects/SkMatrixConvolutionImageFilter.h

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkMatrixConvolutionImageFilter_DEFINED
 #define SkMatrixConvolutionImageFilter_DEFINED
 
 #include "SkImageFilter.h"
 #include "SkScalar.h"
 #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
     effects such as sharpening, blurring, edge detection, etc.
  */
 
 class SK_API SkMatrixConvolutionImageFilter : public SkImageFilter {
 public:
     /*! \enum TileMode */
     enum TileMode {
@@ skipping 44 matching lines @@
                                    const SkScalar* kernel,
                                    SkScalar gain,
                                    SkScalar bias,
                                    const SkIPoint& kernelOffset,
                                    TileMode tileMode,
                                    bool convolveAlpha,
                                    SkImageFilter* input,
                                    const CropRect* cropRect);
     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*, const SkImage* src, const Context&,
+                               SkAutoTUnref<const SkImage>& result, SkIPoint* loc) const SK_OVERRIDE;
     bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
 
 
 #if SK_SUPPORT_GPU
     virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
                                      const SkIRect& bounds) const SK_OVERRIDE;
 #endif
 
 private:
     SkISize   fKernelSize;
@@ skipping 19 matching lines @@
                               SkBitmap* result,
                               const SkIRect& rect,
                               const SkIRect& bounds) const;
     void filterBorderPixels(const SkBitmap& src,
                             SkBitmap* result,
                             const SkIRect& rect,
                             const SkIRect& bounds) const;
 };
 
 #endif