Altered Ganesh's clip stack plumbing to pass down new GrClipData class

http://codereview.appspot.com/6454047/



git-svn-id: http://skia.googlecode.com/svn/trunk@4788 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 49 insertions, 8 deletions

diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index c8020150c1..a017fe3def 100644
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -208,5 +208,40 @@ private:
     };
     SkSTArray<kPreAllocElements, Element>   fList;
 };
+
+/**
+ * GrClipData encapsulates the information required to construct the clip
+ * masks. 'fOrigin' is only non-zero when saveLayer has been called
+ * with an offset bounding box. The clips in 'fClipStack' are in 
+ * device coordinates (i.e., they have been translated by -fOrigin w.r.t.
+ * the canvas' device coordinates).
+ */
+class GrClipData : public SkNoncopyable {
+public:
+    const GrClip*       fClipStack;
+    SkIPoint            fOrigin;
+
+    GrClipData() 
+        : fClipStack(NULL) {
+        fOrigin.setZero();
+    }
+
+    bool operator==(const GrClipData& other) const {
+        if (fOrigin != other.fOrigin) {
+            return false;
+        }
+
+        if (NULL != fClipStack && NULL != other.fClipStack) {
+            return *fClipStack == *other.fClipStack;
+        }
+
+        return fClipStack == other.fClipStack;
+    }
+
+    bool operator!=(const GrClipData& other) const { 
+        return !(*this == other); 
+    }
+};
+
 #endif
 
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index e0f5827139..2f05458c44 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -329,13 +329,13 @@ public:
      * Gets the current clip.
      * @return the current clip.
      */
-    const GrClip& getClip() const;
+    const GrClipData* getClip() const;
 
     /**
      * Sets the clip.
-     * @param clip  the clip to set.
+     * @param clipData  the clip to set.
      */
-    void setClip(const GrClip& clip);
+    void setClip(const GrClipData* clipData);
 
     ///////////////////////////////////////////////////////////////////////////
     // Draws
@@ -694,9 +694,11 @@ public:
     public:
         AutoClip(GrContext* context, const GrRect& newClipRect) 
         : fContext(context)
-        , fNewClip(newClipRect) {
+        , fNewClipStack(newClipRect) {
+            fNewClipData.fClipStack = &fNewClipStack;
+
             fOldClip = fContext->getClip();
-            fContext->setClip(fNewClip);
+            fContext->setClip(&fNewClipData);
         }
 
         ~AutoClip() {
@@ -705,9 +707,11 @@ public:
             }
         }
     private:
-        GrContext*  fContext;
-        GrClip      fOldClip;
-        GrClip      fNewClip;
+        GrContext*        fContext;
+        const GrClipData* fOldClip;
+
+        GrClip            fNewClipStack;
+        GrClipData        fNewClipData;
     };
 
     ///////////////////////////////////////////////////////////////////////////
diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
index 4a628135d6..f576ae499b 100644
--- a/include/gpu/SkGpuDevice.h
+++ b/include/gpu/SkGpuDevice.h
@@ -132,6 +132,8 @@ private:
 
     // the clip stack - on loan to us from SkCanvas so it can be NULL.
     const SkClipStack*  fClipStack;
+    GrClip              fGrClip;
+    GrClipData          fClipData;
 
     // state for our offscreen render-target
     TexCache            fCache;