| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index 54170a3ec93e71a541e7b9d365a817d2721679e5..f3f0d67f15d48225b99b41fdd8926b92dddd1a6c 100644
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -33,7 +33,7 @@ protected:
|
| SkMergeImageFilter(SkReadBuffer& buffer);
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| - virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
|
| + virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
|
|
|
| #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
|
|