Refactor read and write buffers.

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
 
@@ skipping 46 matching lines @@
                                    const SkIPoint& target,
                                    TileMode tileMode,
                                    bool convolveAlpha,
                                    SkImageFilter* input = NULL,
                                    const CropRect* cropRect = NULL);
     virtual ~SkMatrixConvolutionImageFilter();
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter)
 
 protected:
-    SkMatrixConvolutionImageFilter(SkFlattenableReadBuffer& buffer);
-    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+    SkMatrixConvolutionImageFilter(SkReadBuffer& buffer);
+    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
     virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
                                SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
 
 #if SK_SUPPORT_GPU
     virtual bool asNewEffect(GrEffectRef** effect,
                              GrTexture*,
                              const SkMatrix& matrix,
                              const SkIRect& bounds) const SK_OVERRIDE;
 #endif
@@ skipping 22 matching lines @@
                               SkBitmap* result,
                               const SkIRect& rect,
                               const SkIRect& bounds);
     void filterBorderPixels(const SkBitmap& src,
                             SkBitmap* result,
                             const SkIRect& rect,
                             const SkIRect& bounds);
 };
 
 #endif