Remove clip from GrPipelineBuilder

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 "GrTexture.h"
 #include "SkClipStack.h"
 #include "SkDeque.h"
 #include "SkPath.h"
 #include "SkRefCnt.h"
 #include "SkTLList.h"
 #include "SkTypes.h"
 
+class GrClip;
 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
@@ skipping 19 matching lines @@
 /**
  * The clip mask creator handles the generation of the clip mask. If anti
  * aliasing is requested it will (in the future) generate a single channel
  * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
  * mask in the stencil buffer. In the non anti-aliasing case, if the clip
  * mask can be represented as a rectangle then scissoring is used. In all
  * cases scissoring is used to bound the range of the clip mask.
  */
 class GrClipMaskManager : SkNoncopyable {
 public:
-    GrClipMaskManager(GrDrawTarget* owner, bool debugClipBatchToBounds);
+    GrClipMaskManager(GrDrawTarget* owner);
 
     /**
      * Creates a clip mask if necessary as a stencil buffer or alpha texture
      * and sets the GrGpu's scissor and stencil state. If the return is false
      * then the draw can be skipped. devBounds is optional but can help optimize
      * clipping.
      */
-    bool setupClipping(const GrPipelineBuilder&, const SkRect* devBounds, GrAppliedClip*);
-
-    bool setupScissorClip(const GrPipelineBuilder& pipelineBuilder,
-                          const SkIRect& scissor,
-                          const SkRect* devBounds,
-                          GrAppliedClip* out);
+    bool setupClipping(const GrPipelineBuilder&, const GrClip&, const SkRect* devBounds,
+                       GrAppliedClip*);
 
 private:
     inline GrContext* getContext();
     inline const GrCaps* caps() const;
     inline GrResourceProvider* resourceProvider();
 
     static bool PathNeedsSWRenderer(GrContext* context,
                                     bool hasUserStencilSettings,
                                     const GrRenderTarget* rt,
                                     const SkMatrix& viewMatrix,
@@ skipping 60 matching lines @@
                              const GrRenderTarget* rt,
                              const SkVector& clipToMaskOffset,
                              const GrReducedClip::ElementList& elements);
 
     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