Change SkImageFilter's cropRect from SkIRect to a CropRect struct

gm/xfermodeimagefilter.cpp

Index: gm/xfermodeimagefilter.cpp
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp
index ef2958a0c3576b01d6d4250f8f895b0b875bba29..1e9e4d87daa48b24d039c4a3448fc04ecdd0d9fa 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),