GrClip no longer translates its clips (to better mimic SkClipStack's behavior)

http://codereview.appspot.com/6445052/



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

1 files changed, 5 insertions, 13 deletions

diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index d6655dd8e0..bb07c28de1 100644
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -23,11 +23,7 @@ class GrClip {
 public:
     GrClip();
     GrClip(const GrClip& src);
-    /**
-     *  The conservativeBounds parameter already takes (tx,ty) into account.
-     */
-    GrClip(GrClipIterator* iter, GrScalar tx, GrScalar ty,
-           const GrRect& conservativeBounds);
+    GrClip(GrClipIterator* iter, const GrRect& conservativeBounds);
     explicit GrClip(const GrIRect& rect);
     explicit GrClip(const GrRect& rect);
 
@@ -142,20 +138,16 @@ public:
         }
     }
 
-    // FIXME: This word "empty" is confusing. It means that the clip has no
-    // elements (it is the infinite plane) not that it has no area.
-    bool isEmpty() const { return 0 == fList.count(); }
+    // isWideOpen returns true if the clip has no elements (it is the 
+    // infinite plane) not that it has no area.
+    bool isWideOpen() const { return 0 == fList.count(); }
 
     /**
      *  Resets this clip to be empty
      */
     void setEmpty();
 
-    /**
-     *  If specified, the bounds parameter already takes (tx,ty) into account.
-     */
-    void setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty,
-                         const GrRect& conservativeBounds);
+    void setFromIterator(GrClipIterator* iter, const GrRect& conservativeBounds);
     void setFromRect(const GrRect& rect);
     void setFromIRect(const GrIRect& rect);