aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkMergeImageFilter.h
diff options
context:
space:
mode:
authorGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-19 17:26:47 +0000
committerGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-09-19 17:26:47 +0000
commit962c8864e4cf0cfbaf8ea3d17eda83261733362a (patch)
tree0aaf8dea1549a613047b5ed0b9a5131ef4a7ce1c /include/effects/SkMergeImageFilter.h
parenteb95d6a59176e350777a991d4fa9073f6c774b40 (diff)
Implement crop rect support for the merge image filter.
Note: this will require rebaselining of the imagefilterscropped and testimagefilters GMs. R=reed@google.com Review URL: https://codereview.chromium.org/23600047 git-svn-id: http://skia.googlecode.com/svn/trunk@11387 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
-rwxr-xr-xinclude/effects/SkMergeImageFilter.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 8c4313dd13..310c6cd3ac 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)