check for wide-open inside quickContains

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 315 matching lines @@
      */
     void getBounds(SkRect* canvFiniteBound,
                    BoundsType* boundType,
                    bool* isIntersectionOfRects = NULL) const;
 
     /**
      * 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;
+    bool quickContains(const SkRect& devRect) const {
+        return this->isWideOpen() || this->internalQuickContains(devRect);
+    }
+
+    bool quickContains(const SkRRect& devRRect) const {
+        return this->isWideOpen() || this->internalQuickContains(devRRect);
+    }
 
     /**
      * 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);
         this->clipDevRect(r, op, false);
     }
     void clipDevRect(const SkRect&, SkRegion::Op, bool doAA);
     void clipDevRRect(const SkRRect&, SkRegion::Op, bool doAA);
     void clipDevPath(const SkPath&, SkRegion::Op, bool doAA);
     // An optimized version of clipDevRect(emptyRect, kIntersect, ...)
     void clipEmpty();
 
     /**
      * isWideOpen returns true if the clip state corresponds to the infinite
      * plane (i.e., draws are not limited at all)
      */
-    bool isWideOpen() const;
+    bool isWideOpen() const { return this->getTopmostGenID() == kWideOpenGenID; }
 
     /**
      * The generation ID has three reserved values to indicate special
      * (potentially ignorable) cases
      */
     static const int32_t kInvalidGenID = 0;     //!< Invalid id that is never returned by
                                                 //!< SkClipStack. Useful when caching clips
                                                 //!< based on GenID.
     static const int32_t kEmptyGenID = 1;       // no pixels writeable
     static const int32_t kWideOpenGenID = 2;    // all pixels writeable
@@ skipping 101 matching lines @@
     friend class Iter;
 
     SkDeque fDeque;
     int     fSaveCount;
 
     // Generation ID for the clip stack. This is incremented for each
     // clipDevRect and clipDevPath call. 0 is reserved to indicate an
     // invalid ID.
     static int32_t     gGenID;
 
+    bool internalQuickContains(const SkRect& devRect) const;
+    bool internalQuickContains(const SkRRect& devRRect) const;
+
     /**
      * Helper for clipDevPath, etc.
      */
     void pushElement(const Element& element);
 
     /**
      * Restore the stack back to the specified save count.
      */
     void restoreTo(int saveCount);
 
     /**
      * Return the next unique generation ID.
      */
     static int32_t GetNextGenID();
 };
 
 #endif