Attempt to throw away rrect clips of rrects.

include/core/SkClipStack.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 SkClipStack_DEFINED
 #define SkClipStack_DEFINED
 
@@ skipping 140 matching lines @@
                 case kPath_Type:
                     return fPath.get()->conservativelyContainsRect(rect);
                 case kEmpty_Type:
                     return false;
                 default:
                     SkDEBUGFAIL("Unexpected type.");
                     return false;
             }
         }
 
+        bool contains(const SkRRect& rrect) const {
+            switch (fType) {
+                case kRect_Type:
+                    return this->getRect().contains(rrect.getBounds());
+                case kRRect_Type:
+                    // We don't currently have a generalized rrect-rrect containment.
+                    return fRRect.contains(rrect.getBounds()) || rrect == fRRect;
+                case kPath_Type:
+                    return fPath.get()->conservativelyContainsRect(rrect.getBounds());
+                case kEmpty_Type:
+                    return false;
+                default:
+                    SkDEBUGFAIL("Unexpected type.");
+                    return false;
+            }
+        }
+
         /**
          * Is the clip shape inverse filled.
          */
         bool isInverseFilled() const {
             return kPath_Type == fType && fPath.get()->isInverseFillType();
         }
 
         /**
         * Replay this clip into the visitor.
         */
@@ skipping 134 matching lines @@
      * pixels. If 'canvFiniteBound' is an inside out bounding box then it
      * encloses all the un-writeable pixels and the true/normal bound is the
      * infinite plane. isIntersectionOfRects is an optional parameter
      * that is true if 'canvFiniteBound' resulted from an intersection of rects.
      */
     void getBounds(SkRect* canvFiniteBound,
                    BoundsType* boundType,
                    bool* isIntersectionOfRects = NULL) const;
 
     /**
-     * Returns true if the input rect in device space is entirely contained
-     * by the clip. A return value of false does not guarantee that the rect
+     * Returns true if the input (r)rect in device space is entirely contained
+     * by the clip. A return value of false does not guarantee that the (r)rect
      * is not contained by the clip.
      */
     bool quickContains(const SkRect& devRect) const;
+    bool quickContains(const SkRRect& devRRect) const;
 
     /**
      * Flattens the clip stack into a single SkPath. Returns true if any of
      * the clip stack components requires anti-aliasing.
      */
     bool asPath(SkPath* path) const;
 
     void clipDevRect(const SkIRect& ir, SkRegion::Op op) {
         SkRect r;
         r.set(ir);
@@ skipping 141 matching lines @@
      */
     void restoreTo(int saveCount);
 
     /**
      * Return the next unique generation ID.
      */
     static int32_t GetNextGenID();
 };
 
 #endif