SkClipStack::Element tweaks.

include/core/SkCanvas.h

Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 70cfe287b85bb9226803dbdaf045db185eeb96a8..79f3c775413a11fee1df4c6057ab92d234faf32a 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -33,6 +33,7 @@
     #define SK_LEGACY_DRAWTEXT_VIRTUAL
 #endif
 
+class SkCanvasClipVisitor;
 class SkBounder;
 class SkBaseDevice;
 class SkDraw;
@@ -1149,14 +1150,7 @@ public:
         return &fClipStack;
     }
 
-    class ClipVisitor {
-    public:
-        virtual ~ClipVisitor();
-        virtual void clipRect(const SkRect&, SkRegion::Op, bool antialias) = 0;
-        virtual void clipRRect(const SkRRect&, SkRegion::Op, bool antialias) = 0;
-        virtual void clipPath(const SkPath&, SkRegion::Op, bool antialias) = 0;
-    };
-
+    typedef SkCanvasClipVisitor ClipVisitor;
     /**
      *  Replays the clip operations, back to front, that have been applied to
      *  the canvas, calling the appropriate method on the visitor for each
@@ -1504,4 +1498,12 @@ private:
     size_t      fRowBytes;
 };
 

[robertphillips, 2014/05/02 12:35:38]

I know this isn't due to this CL but, why isn't clipRegion in here?

[f(malita), 2014/05/02 12:59:26]

You just put your finger on my biggest concern: SkClipStack doesn't store
SkRegion info at all! SkCanvas::clipRegion() devolves into a clipRect():

    // todo: signal fClipStack that we have a region, and therefore (I guess)
    // we have to ignore it, and use the region directly?
    fClipStack.clipDevRect(rgn.getBounds(), op);

I guess this means using the clip stack for replay will break clipRegion users?

+class SkCanvasClipVisitor {
+public:
+    virtual ~SkCanvasClipVisitor();
+    virtual void clipRect(const SkRect&, SkRegion::Op, bool antialias) = 0;
+    virtual void clipRRect(const SkRRect&, SkRegion::Op, bool antialias) = 0;
+    virtual void clipPath(const SkPath&, SkRegion::Op, bool antialias) = 0;
+};
+
 #endif