diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-10 13:51:19 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-10 13:51:19 +0000 |
| commit | b295fb6ff3222453912dfcb7a1ea5184d40014b5 (patch) | |
| tree | e15812e8b5c505bce63d6a3b277be97456ecc23c /include/effects/SkMergeImageFilter.h | |
| parent | f29c3802899c3e1e285a44140eb32cfa329764dc (diff) | |
Change SkImageFilter's cropRect from SkIRect to a CropRect struct, containing an SkRect and flags indicating which parameters are set.
NOTE: this will require SK_CROP_RECT_IS_INT=1 to be set in Chrome until Blink has been updated to use SkImageFilter::CropRect. Include https://codereview.chromium.org/26528002/ with the Skia roll.
Note also that SK_CROP_RECT_IS_INT is a temporary measure until all call sites in Blink have been updated to use SkRect.
R=reed@google.com
Review URL: https://codereview.chromium.org/26371002
git-svn-id: http://skia.googlecode.com/svn/trunk@11692 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
| -rwxr-xr-x | include/effects/SkMergeImageFilter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 310c6cd3ac..ad464d3fd5 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) |