Make GrClipMaskManager stateless and push GrPipelineBuilder construction downstack

src/gpu/GrClip.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrClip.h"
 
 #include "GrClipMaskManager.h"
+#include "GrDrawContext.h"
 
 void GrNoClip::getConservativeBounds(int width, int height, SkIRect* devResult,
                                      bool* isIntersectionOfRects) const {
     devResult->setXYWH(0, 0, width, height);
     if (isIntersectionOfRects) {
         *isIntersectionOfRects = true;
     }
 }
 
 bool GrFixedClip::quickContains(const SkRect& rect) const {
@@ skipping 12 matching lines @@
     if (fScissorState.enabled()) {
         if (!devResult->intersect(fScissorState.rect())) {
             devResult->setEmpty();
         }
     }
     if (isIntersectionOfRects) {
         *isIntersectionOfRects = true;
     }
 }
 
-bool GrFixedClip::apply(GrClipMaskManager*, const GrPipelineBuilder& pipelineBuilder,
+bool GrFixedClip::apply(GrContext*, const GrPipelineBuilder& pipelineBuilder,
+                        GrDrawContext* drawContext,
                         const SkRect* devBounds, GrAppliedClip* out) const {
     if (fScissorState.enabled()) {
-        const GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
         SkIRect tightScissor;
         if (!tightScissor.intersect(fScissorState.rect(),
-                                    SkIRect::MakeWH(rt->width(), rt->height()))) {
+                                    SkIRect::MakeWH(drawContext->width(), drawContext->height()))) {
             return false;
         }
         if (devBounds && !devBounds->intersects(SkRect::Make(tightScissor))) {
             return false;
         }
         out->makeScissoredStencil(fHasStencilClip, tightScissor);
         return true;
     }
 
     out->makeStencil(fHasStencilClip);
@@ skipping 16 matching lines @@
             *isIntersectionOfRects = true;
         }
         return;
     }
     SkRect devBounds;
     fStack->getConservativeBounds(-fOrigin.x(), -fOrigin.y(), width, height, &devBounds,
                                   isIntersectionOfRects);
     devBounds.roundOut(devResult);
 }
 
-bool GrClipStackClip::apply(GrClipMaskManager* clipMaskManager,
-                            const GrPipelineBuilder& pipelineBuilder, const SkRect* devBounds,
-                            GrAppliedClip* out) const {
-    // TODO: Collapse ClipMaskManager into this class.(?)
-    return clipMaskManager->setupClipping(pipelineBuilder, *this, devBounds, out);
+bool GrClipStackClip::apply(GrContext* context,
+                            const GrPipelineBuilder& pipelineBuilder, GrDrawContext* drawContext,
+                            const SkRect* devBounds, GrAppliedClip* out) const {
+    return GrClipMaskManager::SetupClipping(context, pipelineBuilder, drawContext,
+                                            *this, devBounds, out);
 }