Remove gpu-side clip mask merging from clip mask manager

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"
 #include "GrReducedClip.h"
 #include "GrStencil.h"
 #include "GrTexture.h"
 #include "SkClipStack.h"
 #include "SkDeque.h"
 #include "SkPath.h"
 #include "SkRefCnt.h"
 #include "SkTLList.h"
 #include "SkTypes.h"
 
 class GrDrawTarget;
 class GrPathRenderer;
 class GrPathRendererChain;
+class GrResourceProvider;
 class GrTexture;
 class SkPath;
 
 /**
  * Produced by GrClipMaskManager. It provides a set of modifications to the drawing state that
  * are used to create the final GrPipeline for a GrBatch. This is a work in progress. It will
  * eventually encapsulate all mechanisms for modifying the scissor, shaders, and stencil state
  * to implement clipping.
  */
 class GrAppliedClip : public SkNoncopyable {
@@ skipping 31 matching lines @@
      */
     bool setupClipping(const GrPipelineBuilder&,
                        GrPipelineBuilder::AutoRestoreStencil*,
                        const SkRect* devBounds,
                        GrAppliedClip*);
 
     void adjustPathStencilParams(const GrStencilAttachment*, GrStencilSettings*);
 
 private:
     inline GrContext* getContext();
+    inline const GrCaps* caps() const;
+    inline GrResourceProvider* resourceProvider();
 
     /**
      * Informs the helper function adjustStencilParams() about how the stencil
      * buffer clip is being used.
      */
     enum StencilClipMode {
         // Draw to the clip bit of the stencil buffer
         kModifyClip_StencilClipMode,
         // Clip against the existing representation of the clip in the high bit
         // of the stencil buffer.
@@ skipping 42 matching lines @@
 
     // 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);
 
-    void mergeMask(GrPipelineBuilder*,
-                   GrTexture* dstMask,
-                   GrTexture* srcMask,
-                   SkRegion::Op op,
-                   const SkIRect& dstBound,
-                   const SkIRect& srcBound);
-
-    GrTexture* createTempMask(int width, int height);
-
     /**
      * 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;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED