Remove support for SK_CROP_RECT_IS_INT, now that it is no longer used in Blink or Chrome.

BUG=
R=reed@google.com, reed

Review URL: https://codereview.chromium.org/27521002

git-svn-id: http://skia.googlecode.com/svn/trunk@11812 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 0 insertions, 40 deletions

diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index c8c0c4dbf8..ee43c0e019 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -21,11 +21,7 @@ SK_DEFINE_INST_COUNT(SkImageFilter)
 SkImageFilter::SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect)
   : fInputCount(inputCount),
     fInputs(new SkImageFilter*[inputCount]),
-#ifdef SK_CROP_RECT_IS_INT
-    fCropRect(cropRect ? *cropRect : SkIRect::MakeLargest()) {
-#else
     fCropRect(cropRect ? *cropRect : CropRect(SkRect(), 0x0)) {
-#endif
     for (int i = 0; i < inputCount; ++i) {
         fInputs[i] = inputs[i];
         SkSafeRef(fInputs[i]);
@@ -35,22 +31,14 @@ SkImageFilter::SkImageFilter(int inputCount, SkImageFilter** inputs, const CropR
 SkImageFilter::SkImageFilter(SkImageFilter* input, const CropRect* cropRect)
   : fInputCount(1),
     fInputs(new SkImageFilter*[1]),
-#ifdef SK_CROP_RECT_IS_INT
-    fCropRect(cropRect ? *cropRect : SkIRect::MakeLargest()) {
-#else
     fCropRect(cropRect ? *cropRect : CropRect(SkRect(), 0x0)) {
-#endif
     fInputs[0] = input;
     SkSafeRef(fInputs[0]);
 }
 
 SkImageFilter::SkImageFilter(SkImageFilter* input1, SkImageFilter* input2, const CropRect* cropRect)
   : fInputCount(2), fInputs(new SkImageFilter*[2]),
-#ifdef SK_CROP_RECT_IS_INT
-    fCropRect(cropRect ? *cropRect : SkIRect::MakeLargest()) {
-#else
     fCropRect(cropRect ? *cropRect : CropRect(SkRect(), 0x0)) {
-#endif
     fInputs[0] = input1;
     fInputs[1] = input2;
     SkSafeRef(fInputs[0]);
@@ -73,12 +61,8 @@ SkImageFilter::SkImageFilter(SkFlattenableReadBuffer& buffer)
             fInputs[i] = NULL;
         }
     }
-#ifdef SK_CROP_RECT_IS_INT
-    buffer.readIRect(&fCropRect);
-#else
     buffer.readRect(&fCropRect.fRect);
     fCropRect.fFlags = buffer.readUInt();
-#endif
 }
 
 void SkImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
@@ -90,12 +74,8 @@ void SkImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
             buffer.writeFlattenable(input);
         }
     }
-#ifdef SK_CROP_RECT_IS_INT
-    buffer.writeIRect(fCropRect);
-#else
     buffer.writeRect(fCropRect.fRect);
     buffer.writeUInt(fCropRect.fFlags);
-#endif
 }
 
 bool SkImageFilter::filterImage(Proxy* proxy, const SkBitmap& src,
@@ -178,16 +158,6 @@ bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMa
 
 bool SkImageFilter::applyCropRect(SkIRect* rect, const SkMatrix& matrix) const {
     SkRect cropRect;
-#ifdef SK_CROP_RECT_IS_INT
-    matrix.mapRect(&cropRect, SkRect::Make(fCropRect));
-    SkIRect cropRectI;
-    cropRect.roundOut(&cropRectI);
-    // If the original crop rect edges were unset, max out the new crop edges
-    if (fCropRect.fLeft == SK_MinS32) cropRectI.fLeft = SK_MinS32;
-    if (fCropRect.fTop == SK_MinS32) cropRectI.fTop = SK_MinS32;
-    if (fCropRect.fRight == SK_MaxS32) cropRectI.fRight = SK_MaxS32;
-    if (fCropRect.fBottom == SK_MaxS32) cropRectI.fBottom = SK_MaxS32;
-#else
     matrix.mapRect(&cropRect, fCropRect.fRect);
     SkIRect cropRectI;
     cropRect.roundOut(&cropRectI);
@@ -196,7 +166,6 @@ bool SkImageFilter::applyCropRect(SkIRect* rect, const SkMatrix& matrix) const {
     if (!(fCropRect.fFlags & CropRect::kHasTop_CropEdge)) cropRectI.fTop = SK_MinS32;
     if (!(fCropRect.fFlags & CropRect::kHasRight_CropEdge)) cropRectI.fRight = SK_MaxS32;
     if (!(fCropRect.fFlags & CropRect::kHasBottom_CropEdge)) cropRectI.fBottom = SK_MaxS32;
-#endif
     return rect->intersect(cropRectI);
 }
 
diff --git a/src/effects/SkRectShaderImageFilter.cpp b/src/effects/SkRectShaderImageFilter.cpp
index e99899e191..81aa91ca71 100644
--- a/src/effects/SkRectShaderImageFilter.cpp
+++ b/src/effects/SkRectShaderImageFilter.cpp
@@ -14,20 +14,11 @@
 
 SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) {
     SkASSERT(s);
-#ifdef SK_CROP_RECT_IS_INT
-    SkIRect cropRect;
-    if (rect.width() == 0 || rect.height() == 0) {
-        cropRect = SkIRect::MakeLargest();
-    } else {
-        rect.roundOut(&cropRect);
-    }
-#else
     uint32_t flags = CropRect::kHasAll_CropEdge;
     if (rect.width() == 0 || rect.height() == 0) {
         flags = 0x0;
     }
     CropRect cropRect(rect, flags);
-#endif
     return SkNEW_ARGS(SkRectShaderImageFilter, (s, &cropRect));
 }