Make CropRect immutable after construction.

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)
 
-    struct CropRect {
-        SkRect fRect;
-        uint32_t fFlags;
+    class CropRect {
+    public:
         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) {}
-        // Returns true if any of the crop edges have been set.
-        bool isSet() const
-        {
-            return fFlags != 0x0;
-        }
+        uint32_t flags() const { return fFlags; }
+        const SkRect& rect() const { return fRect; }
+    private:
+        SkRect fRect;
+        uint32_t fFlags;
     };
 
     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
@@ skipping 81 matching lines @@
     /**
      *  Returns the input filter at a given index, or NULL if no input is
      *  connected.  The indices used are filter-specific.
      */
     SkImageFilter* getInput(int i) const {
         SkASSERT(i < fInputCount);
         return fInputs[i];
     }
 
     /**
-     *  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.)
+     *  Returns whether any edges of the crop rect have been set. The crop
+     *  rect is set at construction time, and determines which pixels from the
+     *  input image will be processed. The size of the crop rect 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.)
      */
-    bool cropRectIsSet() const { return fCropRect.isSet(); }
+    bool cropRectIsSet() const { return fCropRect.flags() != 0x0; }
 
 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