Revert of Begin weaning GrClipMaskManager off of GrDrawTarget (take 2)

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 36354545d525fc0c53d846d942837a2990147aaf..6b9b727161131c7e7fc3e7326f40f5057d866b4d 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -69,12 +69,6 @@
                        const SkRect* devBounds,
                        GrAppliedClip*);
 
-    bool setupScissorClip(const GrPipelineBuilder& pipelineBuilder,
-                          GrPipelineBuilder::AutoRestoreStencil* ars,
-                          const SkIRect& scissor,    
-                          const SkRect* devBounds,
-                          GrAppliedClip* out);
-
     void adjustPathStencilParams(const GrStencilAttachment*, GrStencilSettings*);
 
 private:
@@ -129,26 +123,32 @@
 
     // Creates an alpha mask of the clip. The mask is a rasterization of elements through the
     // rect specified by clipSpaceIBounds.
-    static GrTexture* CreateAlphaClipMask(GrContext*,
-                                          int32_t elementsGenID,
-                                          GrReducedClip::InitialState initialState,
-                                          const GrReducedClip::ElementList& elements,
-                                          const SkVector& clipToMaskOffset,
-                                          const SkIRect& clipSpaceIBounds);
+    GrTexture* createAlphaClipMask(int32_t elementsGenID,
+                                   GrReducedClip::InitialState initialState,
+                                   const GrReducedClip::ElementList& elements,
+                                   const SkVector& clipToMaskOffset,
+                                   const SkIRect& clipSpaceIBounds);
 
     // Similar to createAlphaClipMask but it rasterizes in SW and uploads to the result texture.
-    static GrTexture* CreateSoftwareClipMask(GrContext*,
-                                             int32_t elementsGenID,
-                                             GrReducedClip::InitialState initialState,
-                                             const GrReducedClip::ElementList& elements,
-                                             const SkVector& clipToMaskOffset,
-                                             const SkIRect& clipSpaceIBounds);
+    GrTexture* createSoftwareClipMask(int32_t elementsGenID,
+                                      GrReducedClip::InitialState initialState,
+                                      const GrReducedClip::ElementList& elements,
+                                      const SkVector& clipToMaskOffset,
+                                      const SkIRect& clipSpaceIBounds);
 
-   static bool UseSWOnlyPath(GrContext*,
-                             const GrPipelineBuilder&,
-                             const GrRenderTarget* rt,
-                             const SkVector& clipToMaskOffset,
-                             const GrReducedClip::ElementList& elements);
+   bool useSWOnlyPath(const GrPipelineBuilder&,
+                      const GrRenderTarget* rt,
+                      const SkVector& clipToMaskOffset,
+                      const GrReducedClip::ElementList& elements);
+
+    // Draws a clip element into the target alpha mask. The caller should have already setup the
+    // desired blend operation. Optionally if the caller already selected a path renderer it can
+    // be passed. Otherwise the function will select one if the element is a path.
+    bool drawElement(GrPipelineBuilder*,
+                     const SkMatrix& viewMatrix,
+                     GrTexture* target,
+                     const SkClipStack::Element*,
+                     GrPathRenderer* pr = nullptr);
 
     /**
      * Called prior to return control back the GrGpu in setupClipping. It updates the