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

src/gpu/GrClipMaskManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
 #include "GrPipelineBuilder.h"
@@ skipping 51 matching lines @@
      * and sets the GrGpu's scissor and stencil state. If the return is false
      * then the draw can be skipped. The AutoRestoreEffects is initialized by
      * the manager when it must install additional effects to implement the
      * clip. devBounds is optional but can help optimize clipping.
      */
     bool setupClipping(const GrPipelineBuilder&,
                        GrPipelineBuilder::AutoRestoreStencil*,
                        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:
     inline GrContext* getContext();
     inline const GrCaps* caps() const;
     inline GrResourceProvider* resourceProvider();
 
     static bool PathNeedsSWRenderer(GrContext* context,
                                     bool isStencilDisabled,
                                     const GrRenderTarget* rt,
@@ skipping 34 matching lines @@
     // Draws the clip into the stencil buffer
     bool createStencilClipMask(GrRenderTarget*,
                                int32_t elementsGenID,
                                GrReducedClip::InitialState initialState,
                                const GrReducedClip::ElementList& elements,
                                const SkIRect& clipSpaceIBounds,
                                const SkIPoint& clipSpaceToStencilOffset);
 
     // 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
      * GrPipelineBuilder with stencil settings that account for stencil-based clipping.
      */
     void setPipelineBuilderStencil(const GrPipelineBuilder&,
                                    GrPipelineBuilder::AutoRestoreStencil*);
 
     /**
      * Adjusts the stencil settings to account for interaction with stencil
      * clipping.
      */
     void adjustStencilParams(GrStencilSettings* settings,
                              StencilClipMode mode,
                              int stencilBitCnt);
 
     GrTexture* createCachedMask(int width, int height, const GrUniqueKey& key, bool renderTarget);
 
     static const int kMaxAnalyticElements = 4;
 
     GrDrawTarget*   fDrawTarget;    // This is our owning draw target.
     StencilClipMode fClipMode;
     bool            fDebugClipBatchToBounds;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED