clear stencil clip on draw target

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 33d5efec4fc9edd3f7062f941f1b083b9291e8d6..13857b8a31066bef738f2af00624c28f23e2c8ee 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -9,6 +9,7 @@
 #define GrDrawTarget_DEFINED
 
 #include "GrClipData.h"
+#include "GrClipMaskManager.h"
 #include "GrContext.h"
 #include "GrDrawState.h"
 #include "GrIndexBuffer.h"
@@ -419,6 +420,14 @@ public:
                        GrRenderTarget* renderTarget = NULL) = 0;
 
     /**
+     * Similar to the above.  DrawTarget subclass sets clip bit in the stencil buffer. The subclass
+     * is free to clear the remaining bits to zero if masked clears are more
+     * expensive than clearing all bits.
+     */
+
+    virtual void clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* = NULL) = 0;

[bsalomon, 2014/10/28 15:08:01]

Does this need to be on GrDT or can it just be on GrGpu? I don't think this
should be exposed to any code that has a GrDT but should be called on GrGpu by
GrDT on behalf of GrCMM 

+
+    /**
      * Discards the contents render target. NULL indicates that the current render target should
      * be discarded.
      **/
@@ -692,15 +701,6 @@ public:
 
     virtual DrawToken getCurrentDrawToken() { return DrawToken(this, 0); }
 
-    // The state of the scissor is controlled by the clip manager, no one else should set
-    // Scissor state
-    struct ScissorState {
-        ScissorState() : fEnabled(false) {}
-        void set(const SkIRect& rect) { fRect = rect; fEnabled = true; }
-        bool    fEnabled;
-        SkIRect fRect;
-    };
-
 protected:
     // Extend access to GrDrawState::convertToPEndeingExec to subclasses.
     void convertDrawStateToPendingExec(GrDrawState* ds) {