| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index ad464d3fd5aa079d8f7c0d4f8e6e59523a62c31a..bd9ab6c8e98d34592a9bc3ab28bda1b2ee0961b9 100755
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -25,8 +25,8 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
|
|
|
| protected:
|
| - SkMergeImageFilter(SkFlattenableReadBuffer& buffer);
|
| - virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
|
| + SkMergeImageFilter(SkReadBuffer& buffer);
|
| + virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
|
| SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
|
|
|