| Index: include/effects/SkMergeImageFilter.h
|
| diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
|
| index 8c4313dd13a8ec610df6271185fd54edf2339b25..310c6cd3acb3ef8a5ab406120e5ed2eca5277dc2 100755
|
| --- a/include/effects/SkMergeImageFilter.h
|
| +++ b/include/effects/SkMergeImageFilter.h
|
| @@ -15,9 +15,11 @@
|
| class SK_API SkMergeImageFilter : public SkImageFilter {
|
| public:
|
| SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
|
| - SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
|
| + SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
|
| + const SkIRect* cropRect = NULL);
|
| SkMergeImageFilter(SkImageFilter* filters[], int count,
|
| - const SkXfermode::Mode modes[] = NULL);
|
| + const SkXfermode::Mode modes[] = NULL,
|
| + const SkIRect* cropRect = NULL);
|
| virtual ~SkMergeImageFilter();
|
|
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
|
|
|