| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index 10c29131ed425f3c856752932307ddbf7d7555ca..668e06f6da8e2fe1abe31058deedff4d164e06c5 100644
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -35,8 +35,8 @@ public:
|
|
|
| protected:
|
| void flatten(SkWriteBuffer&) const override;
|
| - bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
|
| - SkIPoint* loc) const override;
|
| + bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
|
| + SkIPoint* loc) const override;
|
|
|
| private:
|
| SkMergeImageFilter(SkImageFilter* filters[], int count, const SkXfermode::Mode modes[],
|
|
|