Change SkImageFilter's cropRect from SkIRect to a CropRect struct

tests/ImageFilterTest.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkBicubicImageFilter.h"
@@ skipping 49 matching lines @@
     static SkImageFilter* make_scale(float amount, SkImageFilter* input = NULL) {
         SkScalar s = SkFloatToScalar(amount);
         SkScalar matrix[20] = { s, 0, 0, 0, 0,
                                 0, s, 0, 0, 0,
                                 0, 0, s, 0, 0,
                                 0, 0, 0, s, 0 };
         SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
         return SkColorFilterImageFilter::Create(filter, input);
     }
 
-    static SkImageFilter* make_grayscale(SkImageFilter* input = NULL, const SkIRect* cropRect = NULL) {
+    static SkImageFilter* make_grayscale(SkImageFilter* input = NULL, const SkImageFilter::CropRect* cropRect = NULL) {
         SkScalar matrix[20];
         memset(matrix, 0, 20 * sizeof(SkScalar));
         matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f);
         matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f);
         matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f);
         matrix[18] = SkFloatToScalar(1.0f);
         SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
         return SkColorFilterImageFilter::Create(filter, input, cropRect);
     }
 
@@ skipping 21 matching lines @@
         {
             // Check that a color filter image filter without a crop rect can be
             // expressed as a color filter.
             SkAutoTUnref<SkImageFilter> gray(make_grayscale());
             REPORTER_ASSERT(reporter, true == gray->asColorFilter(NULL));
         }
 
         {
             // Check that a color filter image filter with a crop rect cannot
             // be expressed as a color filter.
+#ifdef SK_CROP_RECT_IS_INT
             SkIRect cropRect = SkIRect::MakeXYWH(0, 0, 100, 100);
+#else
+            SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(0, 0, 100, 100));
+#endif
             SkAutoTUnref<SkImageFilter> grayWithCrop(make_grayscale(NULL, &cropRect));
             REPORTER_ASSERT(reporter, false == grayWithCrop->asColorFilter(NULL));
         }
 
         {
             // Tests pass by not asserting
             SkBitmap bitmap, result;
             make_small_bitmap(bitmap);
             result.setConfig(SkBitmap::kARGB_8888_Config, kBitmapSize, kBitmapSize);
             result.allocPixels();
@@ skipping 31 matching lines @@
                 REPORTER_ASSERT(reporter,
                     !bicubic->filterImage(&proxy, bitmap, SkMatrix::I(), &result, &loc));
             }
         }
     }
 };
 
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("ImageFilterTest", ImageFilterTestClass, ImageFilterTest::Test)