Begin weaning GrClipMaskManager off of GrDrawTarget (take 2)

include/gpu/GrDrawContext.h

Index: include/gpu/GrDrawContext.h
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
index 8042ab12c690a572cc109d480d08d2e754049aed..c61182b41d4b9467b4386fd5e4c9b4103193226c 100644
--- a/include/gpu/GrDrawContext.h
+++ b/include/gpu/GrDrawContext.h
@@ -11,6 +11,7 @@
 #include "GrColor.h"
 #include "GrRenderTarget.h"
 #include "SkRefCnt.h"
+#include "SkRegion.h"
 #include "SkSurfaceProps.h"
 #include "../private/GrSingleOwner.h"
 
@@ -26,6 +27,7 @@ class GrPaint;
 class GrPathProcessor;
 class GrPipelineBuilder;
 class GrRenderTarget;
+class GrStencilSettings;
 class GrStrokeInfo;
 class GrSurface;
 class SkDrawFilter;
@@ -102,6 +104,14 @@ public:
                   const SkRect&,
                   const GrStrokeInfo* strokeInfo = NULL);
 
+    bool stencilRect(const SkIRect* scissorRect,

[joshualitt, 2016/03/01 17:34:50]

I really like the direction this CL is going, but do we want this to be on a
subclass of the DC?

to play devil's advocate to myself, what about DefaultPathRenderer? Doesn't he
need to use the stencil?  In any case do we want to limit this usage to internal
constructs?

[bsalomon, 2016/03/01 17:38:55]

I think the name here isn't quite right... it isn't just stenciling.
drawAndStencilClipRect? perfomClipRectCoverageAndStencil()?
addRectToCoverageClipMask?

[bsalomon, 2016/03/01 17:40:06]

I think some way of hiding this is in order (priv class, subclass, ...). Don't
want someone to call this from say an image filter impl. I think this is a
pretty fragile signature that should only exist for the ccm.

[robertphillips, 2016/03/01 20:11:57]

Done - for now. I was hoping to fold the stencil-only path into this call too
but we can re-rename it if that succeeds.

[robertphillips, 2016/03/01 20:11:57]

Done. I have added GrDrawContextPriv.

+                     const GrStencilSettings&,
+                     SkRegion::Op op,
+                     bool invert,
+                     bool doAA,
+                     const SkMatrix& viewMatrix,
+                     const SkRect&);
+
     /**
      * Maps a rectangle of shader coordinates to a rectangle and fills that rectangle.
      *
@@ -155,6 +165,14 @@ public:
                   const SkPath&,
                   const GrStrokeInfo&);
 
+    bool stencilPath(const SkIRect* scissorRect,
+                     const GrStencilSettings&,
+                     SkRegion::Op op,
+                     bool invert,
+                     bool doAA,
+                     const SkMatrix& viewMatrix,
+                     const SkPath&);
+
     /**
      * Draws vertices with a paint.
      *
@@ -280,6 +298,10 @@ private:
     friend class GrAtlasTextBlob; // for access to drawBatch
     friend class GrDrawingManager; // for ctor
 
+    GrDrawBatch* getFillRectBatch(const GrPaint& paint,
+                                  const SkMatrix& viewMatrix,
+                                  const SkRect& rect);
+
     void internalDrawPath(GrPipelineBuilder*,
                           const SkMatrix& viewMatrix,
                           GrColor,