Revert of Revert of allow canvas to force conservative clips (for speed)

src/core/SkRasterClip.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkRasterClip_DEFINED
 #define SkRasterClip_DEFINED
 
 #include "SkRegion.h"
 #include "SkAAClip.h"
 
 class SkRasterClip {
 public:
-    SkRasterClip();
-    SkRasterClip(const SkIRect&);
+    SkRasterClip(bool forceConservativeRects = false);
+    SkRasterClip(const SkIRect&, bool forceConservativeRects = false);
     SkRasterClip(const SkRasterClip&);
     ~SkRasterClip();
 
+    bool isForceConservativeRects() const { return fForceConservativeRects; }
+
     bool isBW() const { return fIsBW; }
     bool isAA() const { return !fIsBW; }
     const SkRegion& bwRgn() const { SkASSERT(fIsBW); return fBW; }
     const SkAAClip& aaRgn() const { SkASSERT(!fIsBW); return fAA; }
 
     bool isEmpty() const {
         SkASSERT(this->computeIsEmpty() == fIsEmpty);
         return fIsEmpty;
     }
 
     bool isRect() const {
         SkASSERT(this->computeIsRect() == fIsRect);
         return fIsRect;
     }
 
     bool isComplex() const;
     const SkIRect& getBounds() const;
 
     bool setEmpty();
     bool setRect(const SkIRect&);
 
     bool op(const SkIRect&, SkRegion::Op);
     bool op(const SkRegion&, SkRegion::Op);
-    bool op(const SkRect&, SkRegion::Op, bool doAA);
+    bool op(const SkRect&, const SkISize&, SkRegion::Op, bool doAA);
     bool op(const SkPath&, const SkISize&, SkRegion::Op, bool doAA);
     
     void translate(int dx, int dy, SkRasterClip* dst) const;
     void translate(int dx, int dy) {
         this->translate(dx, dy, this);
     }
 
     bool quickContains(const SkIRect& rect) const;
     bool quickContains(int left, int top, int right, int bottom) const {
         return quickContains(SkIRect::MakeLTRB(left, top, right, bottom));
@@ skipping 13 matching lines @@
 
 #ifdef SK_DEBUG
     void validate() const;
 #else
     void validate() const {}
 #endif
 
 private:
     SkRegion    fBW;
     SkAAClip    fAA;
+    bool        fForceConservativeRects;
     bool        fIsBW;
     // these 2 are caches based on querying the right obj based on fIsBW
     bool        fIsEmpty;
     bool        fIsRect;
 
     bool computeIsEmpty() const {
         return fIsBW ? fBW.isEmpty() : fAA.isEmpty();
     }
 
     bool computeIsRect() const {
@@ skipping 12 matching lines @@
 
         fIsRect = this->computeIsRect();
         return !fIsEmpty;
     }
 
     void convertToAA();
 
     bool setPath(const SkPath& path, const SkRegion& clip, bool doAA);
     bool setPath(const SkPath& path, const SkIRect& clip, bool doAA);
     bool op(const SkRasterClip&, SkRegion::Op);
+    bool setConservativeRect(const SkRect& r, const SkIRect& clipR, bool isInverse);
 };
 
 class SkAutoRasterClipValidate : SkNoncopyable {
 public:
     SkAutoRasterClipValidate(const SkRasterClip& rc) : fRC(rc) {
         fRC.validate();
     }
     ~SkAutoRasterClipValidate() {
         fRC.validate();
     }
@@ skipping 42 matching lines @@
 
 private:
     SkRegion        fBWRgn;
     SkAAClipBlitter fAABlitter;
     // what we return
     const SkRegion* fClipRgn;
     SkBlitter* fBlitter;
 };
 
 #endif