| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index ed316d78538e18b879876dbb7dea9a226bb63cd5..a9a14a95cd4784f434f97a41154e527fa7d8018b 100644
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -35,7 +35,9 @@ protected:
|
| SkMergeImageFilter(SkImageFilter* filters[], int count,
|
| const SkXfermode::Mode modes[],
|
| const CropRect* cropRect);
|
| +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| explicit SkMergeImageFilter(SkReadBuffer& buffer);
|
| +#endif
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
|
|