Change SkImageFilter's cropRect from SkIRect to a CropRect struct

gm/lighting.cpp

 /*
  * Copyright 2012 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 "SkLightingImageFilter.h"
 
@@ skipping 67 matching lines @@
         SkPoint3 spotTarget(SkIntToScalar(40), SkIntToScalar(40), 0);
         SkScalar spotExponent = SK_Scalar1;
         SkScalar cutoffAngle = SkIntToScalar(15);
         SkScalar kd = SkIntToScalar(2);
         SkScalar ks = SkIntToScalar(1);
         SkScalar shininess = SkIntToScalar(8);
         SkScalar surfaceScale = SkIntToScalar(1);
         SkColor white(0xFFFFFFFF);
         SkPaint paint;
 
+#ifdef SK_CROP_RECT_IS_INT
         SkIRect cropRect = SkIRect::MakeXYWH(20, 10, 60, 65);
+#else
+        SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(20, 10, 60, 65));
+#endif
 
         int y = 0;
         for (int i = 0; i < 2; i++) {
-            const SkIRect* cr = (i == 0) ? NULL : &cropRect;
+            const SkImageFilter::CropRect* cr = (i == 0) ? NULL : &cropRect;
             paint.setImageFilter(SkLightingImageFilter::CreatePointLitDiffuse(pointLocation, white, surfaceScale, kd, NULL, cr))->unref();
             drawClippedBitmap(canvas, paint, 0, y);
 
             paint.setImageFilter(SkLightingImageFilter::CreateDistantLitDiffuse(distantDirection, white, surfaceScale, kd, NULL, cr))->unref();
             drawClippedBitmap(canvas, paint, 110, y);
 
             paint.setImageFilter(SkLightingImageFilter::CreateSpotLitDiffuse(spotLocation, spotTarget, spotExponent, cutoffAngle, white, surfaceScale, kd, NULL, cr))->unref();
             drawClippedBitmap(canvas, paint, 220, y);
 
             y += 110;
@@ skipping 16 matching lines @@
     SkBitmap fBitmap;
     bool fInitialized;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ImageLightingGM; }
 static GMRegistry reg(MyFactory);
 
 }