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/morphology.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/morphology.cpp')
| -rw-r--r-- | gm/morphology.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gm/morphology.cpp b/gm/morphology.cpp index 2150689b87..9e67bfaa73 100644 --- a/gm/morphology.cpp +++ b/gm/morphology.cpp @@ -70,11 +70,15 @@ protected: { 24, 24, 25, 25 }, }; SkPaint paint; +#ifdef SK_CROP_RECT_IS_INT SkIRect cropRect = SkIRect::MakeXYWH(25, 20, 100, 80); +#else + SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(25, 20, 100, 80)); +#endif for (unsigned j = 0; j < 4; ++j) { for (unsigned i = 0; i < SK_ARRAY_COUNT(samples); ++i) { - const SkIRect* cr = j & 0x02 ? &cropRect : NULL; + const SkImageFilter::CropRect* cr = j & 0x02 ? &cropRect : NULL; if (j & 0x01) { paint.setImageFilter(new SkErodeImageFilter( samples[i].fRadiusX, |