Define clear regions in terms of GrFixedClip

src/gpu/GrDrawContextPriv.h

Index: src/gpu/GrDrawContextPriv.h
diff --git a/src/gpu/GrDrawContextPriv.h b/src/gpu/GrDrawContextPriv.h
index 31d8481c73856ce9054cf6a8cb7c5f544c38710e..63eae12a061437602ca24b0306d107f921d3baee 100644
--- a/src/gpu/GrDrawContextPriv.h
+++ b/src/gpu/GrDrawContextPriv.h
@@ -25,9 +25,11 @@ public:
         return fDrawContext->getDrawTarget()->instancedRendering();
     }
 
-    void clearStencilClip(const SkIRect& rect, bool insideClip);
+    void clear(const GrFixedClip&, const GrColor, bool canIgnoreClip);
 
-    void stencilRect(const GrFixedClip& clip,
+    void clearStencilClip(const GrFixedClip&, bool insideStencilMask);
+
+    void stencilRect(const GrClip& clip,
                      const GrUserStencilSettings* ss,
                      bool useHWAA,
                      const SkMatrix& viewMatrix,
@@ -38,7 +40,7 @@ public:
                      const SkMatrix& viewMatrix,
                      const GrPath*);
 
-    bool drawAndStencilRect(const GrFixedClip&,
+    bool drawAndStencilRect(const GrClip&,
                             const GrUserStencilSettings*,
                             SkRegion::Op op,
                             bool invert,
@@ -46,7 +48,7 @@ public:
                             const SkMatrix& viewMatrix,
                             const SkRect&);
 
-    bool drawAndStencilPath(const GrFixedClip&,
+    bool drawAndStencilPath(const GrClip&,
                             const GrUserStencilSettings*,
                             SkRegion::Op op,
                             bool invert,