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 /gm/xfermodeimagefilter.cpp | |
| 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 'gm/xfermodeimagefilter.cpp')
| -rw-r--r-- | gm/xfermodeimagefilter.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index ef2958a0c3..1e9e4d87da 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -207,9 +207,14 @@ protected: y + offsets[i][1], fBitmap.width() + offsets[i][2], fBitmap.height() + offsets[i][3]); +#ifdef SK_CROP_RECT_IS_INT + SkIRect rect = cropRect; +#else + SkImageFilter::CropRect rect(SkRect::Make(cropRect)); +#endif mode.reset(SkXfermode::Create(sampledModes[i])); filter.reset(SkNEW_ARGS(SkXfermodeImageFilter, - (mode, offsetBackground, offsetForeground, &cropRect))); + (mode, offsetBackground, offsetForeground, &rect))); paint.setImageFilter(filter); canvas->save(); canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), |