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

include/core/SkImageFilter.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageFilter_DEFINED
 #define SkImageFilter_DEFINED
 
@@ skipping 13 matching lines @@
  *  Base class for image filters. If one is installed in the paint, then
  *  all drawing occurs as usual, but it is as if the drawing happened into an
  *  offscreen (before the xfermode is applied). This offscreen bitmap will
  *  then be handed to the imagefilter, who in turn creates a new bitmap which
  *  is what will finally be drawn to the device (using the original xfermode).
  */
 class SK_API SkImageFilter : public SkFlattenable {
 public:
     SK_DECLARE_INST_COUNT(SkImageFilter)
 
-#ifdef SK_CROP_RECT_IS_INT
-    typedef SkIRect CropRect;
-#else
     struct CropRect {
         SkRect fRect;
         uint32_t fFlags;

[reed1, 2013/10/16 14:51:53]

Is your longer-term plan to keep these fields exposed, or to wrap/hide them, in
the spirit of other structs like SkRRect?

[Stephen White, 2013/10/16 14:57:15]

I was going to leave it as a struct, in the spirit of SkRect.

[reed1, 2013/10/16 14:59:27]

Not sure if you're serious, but rect doesn't have bitfields in a flag-int.
Everywhere we have that sort of sophistication, we usually guard it (e.g. Paint,
Matrix), where we care about the client not writing undefined bits.

         enum CropEdge {
             kHasLeft_CropEdge   = 0x01,
             kHasTop_CropEdge    = 0x02,
             kHasRight_CropEdge  = 0x04,
             kHasBottom_CropEdge = 0x08,
             kHasAll_CropEdge    = 0x0F,
         };
         CropRect() {}
         explicit CropRect(const SkRect& rect, uint32_t flags = kHasAll_CropEdge) : fRect(rect), fFlags(flags) {}
         bool isSet() const

[reed1, 2013/10/16 14:51:53]

Can we have a more descriptive name, and/or some dox for this predicate?

[Stephen White, 2013/10/16 14:57:15]

Done.

         {
             return fFlags != 0x0;
         }
     };
-#endif
 
     class Proxy {
     public:
         virtual ~Proxy() {};
 
         virtual SkBaseDevice* createDevice(int width, int height) = 0;
         // returns true if the proxy can handle this filter natively
         virtual bool canHandleImageFilter(SkImageFilter*) = 0;
         // returns true if the proxy handled the filter itself. if this returns
         // false then the filter's code will be called.
@@ skipping 88 matching lines @@
 
     /**
      *  Returns the crop rectangle of this filter. This is set at construction
      *  time, and determines which pixels from the input image will
      *  be processed. The size of this rectangle should be used as the size
      *  of the destination image. The origin of this rect should be used to
      *  offset access to the input images, and should also be added to the
      *  "offset" parameter in onFilterImage and filterImageGPU(). (The latter
      *  ensures that the resulting buffer is drawn in the correct location.)
      */
-#ifdef SK_CROP_RECT_IS_INT
-    bool cropRectIsSet() const { return !fCropRect.isLargest(); }
-#else
     bool cropRectIsSet() const { return fCropRect.isSet(); }
-#endif
 
 protected:
     SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect = NULL);
 
     // Convenience constructor for 1-input filters.
     explicit SkImageFilter(SkImageFilter* input, const CropRect* cropRect = NULL);
 
     // Convenience constructor for 2-input filters.
     SkImageFilter(SkImageFilter* input1, SkImageFilter* input2, const CropRect* cropRect = NULL);
 
@@ skipping 15 matching lines @@
     bool applyCropRect(SkIRect* rect, const SkMatrix& matrix) const;
 
 private:
     typedef SkFlattenable INHERITED;
     int fInputCount;
     SkImageFilter** fInputs;
     CropRect fCropRect;
 };
 
 #endif