diff options
| author |  senorblanco <senorblanco@chromium.org> | 2015-07-16 15:19:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-16 15:19:11 -0700 |
| commit | ed7cf273226ca5818a9d58b0f9183d665bb1ff58 (patch) | |
| tree | 769bacf9d196a8ac32b2e633064426407746de0d | |
| parent | 47d280d3b0f3e271d29ffcffa061b5ad54f08b7e (diff) | |
Now that the SkImageFilter::CropRect crop edges refer to
width & height, name them appropriately.
BUG=240827
Review URL: https://codereview.chromium.org/1234873005
| -rw-r--r-- | include/core/SkImageFilter.h | 8 | ||||
| -rw-r--r-- | src/core/SkImageFilter.cpp | 12 | ||||
| -rw-r--r-- | tests/ImageFilterTest.cpp | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 896636bb75..16a038285c 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -64,8 +64,12 @@ public: enum CropEdge { kHasLeft_CropEdge = 0x01, kHasTop_CropEdge = 0x02, - kHasRight_CropEdge = 0x04, - kHasBottom_CropEdge = 0x08, + kHasWidth_CropEdge = 0x04, + kHasHeight_CropEdge = 0x08, +#ifdef SK_LEGACY_IMAGE_FILTER_CROP_RECT_EDGES + kHasRight_CropEdge = kHasWidth_CropEdge, + kHasBottom_CropEdge = kHasHeight_CropEdge, +#endif kHasAll_CropEdge = 0x0F, }; CropRect() {} diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index fb7d8b28c0..75f601ebdb 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -50,13 +50,13 @@ void SkImageFilter::CropRect::toString(SkString* str) const { } else { str->appendf("X, "); } - if (fFlags & CropRect::kHasRight_CropEdge) { - str->appendf("%.2f, ", fRect.fRight); + if (fFlags & CropRect::kHasWidth_CropEdge) { + str->appendf("%.2f, ", fRect.width()); } else { str->appendf("X, "); } - if (fFlags & CropRect::kHasBottom_CropEdge) { - str->appendf("%.2f", fRect.fBottom); + if (fFlags & CropRect::kHasHeight_CropEdge) { + str->appendf("%.2f", fRect.height()); } else { str->appendf("X"); } @@ -79,10 +79,10 @@ bool SkImageFilter::CropRect::applyTo(const SkIRect& imageBounds, const Context& if (fFlags & kHasTop_CropEdge) { cropped->fTop = devICropR.fTop; } - if (fFlags & kHasRight_CropEdge) { + if (fFlags & kHasWidth_CropEdge) { cropped->fRight = cropped->fLeft + devICropR.width(); } - if (fFlags & kHasBottom_CropEdge) { + if (fFlags & kHasHeight_CropEdge) { cropped->fBottom = cropped->fTop + devICropR.height(); } } diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index a5ffb1b226..d822212ac6 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -1147,7 +1147,7 @@ DEF_TEST(PartialCropRect, reporter) { SkImageFilter::Proxy proxy(&device); SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(100, 0, 20, 30), - SkImageFilter::CropRect::kHasRight_CropEdge | SkImageFilter::CropRect::kHasBottom_CropEdge); + SkImageFilter::CropRect::kHasWidth_CropEdge | SkImageFilter::CropRect::kHasHeight_CropEdge); SkAutoTUnref<SkImageFilter> filter(make_grayscale(NULL, &cropRect)); SkBitmap result; SkIPoint offset; |