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