Change SkImageFilter's cropRect from SkIRect to a CropRect struct

gm/imagefilterscropped.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
@@ skipping 115 matching lines @@
         return kSkipScaledReplay_Flag;
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
             draw_sprite, draw_bitmap, draw_path, draw_paint, draw_text
         };
 
         SkAutoTUnref<SkColorFilter> cf(
             SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
+#ifdef SK_CROP_RECT_IS_INT
         SkIRect cropRect = SkIRect::MakeXYWH(10, 10, 44, 44);
         SkIRect bogusRect = SkIRect::MakeXYWH(-100, -100, 10, 10);
+#else
+        SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)), SkImageFilter::CropRect::kHasAll_CropEdge);
+        SkImageFilter::CropRect bogusRect(SkRect::Make(SkIRect::MakeXYWH(-100, -100, 10, 10)), SkImageFilter::CropRect::kHasAll_CropEdge);
+#endif
 
         SkAutoTUnref<SkImageFilter> offset(new SkOffsetImageFilter(
             SkIntToScalar(-10), SkIntToScalar(-10)));
 
         SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get()));
 
         SkImageFilter* filters[] = {
             NULL,
             SkColorFilterImageFilter::Create(cf.get(), NULL, &cropRect),
             new SkBlurImageFilter(1.0f, 1.0f, NULL, &cropRect),
@@ skipping 27 matching lines @@
     }
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersCroppedGM; }
 static skiagm::GMRegistry reg(MyFactory);