| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index ba580f1c5b7b26afa4dba68f729ceaa6535ed364..ba2849b778a0ee7410c023249bcbf788c4c401f9 100644
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -39,7 +39,7 @@ protected:
|
| const SkXfermode::Mode modes[],
|
| const CropRect* cropRect,
|
| uint32_t uniqueID);
|
| - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
| SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
|
|
|