Retract PipelineBuilder from GrClip::apply

src/gpu/GrDrawContext.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchTest.h"
 #include "GrColor.h"
 #include "GrDrawContext.h"
@@ skipping 468 matching lines @@
     ASSERT_SINGLE_OWNER_PRIV
     RETURN_IF_ABANDONED_PRIV
     SkDEBUGCODE(fDrawContext->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fDrawContext->fAuditTrail, "GrDrawContextPriv::clearStencilClip");
 
     AutoCheckFlush acf(fDrawContext->fDrawingManager);
     fDrawContext->getDrawTarget()->clearStencilClip(rect, insideClip,
                                                     fDrawContext->accessRenderTarget());
 }
 
-void GrDrawContextPriv::stencilPath(const GrPipelineBuilder& pipelineBuilder,
-                                    const GrClip& clip, 
+void GrDrawContextPriv::stencilPath(const GrClip& clip, 
+                                    const GrUserStencilSettings* ss,
+                                    bool useHWAA,
                                     const SkMatrix& viewMatrix,
-                                    const GrPath* path,
-                                    GrPathRendering::FillType fill) {
-    fDrawContext->getDrawTarget()->stencilPath(pipelineBuilder, fDrawContext,
-                                               clip, viewMatrix, path, fill);
+                                    const GrPath* path) {
+    fDrawContext->getDrawTarget()->stencilPath(fDrawContext, clip, ss, useHWAA, viewMatrix, path);
 }
 
 void GrDrawContextPriv::stencilRect(const GrFixedClip& clip,
                                     const GrUserStencilSettings* ss,
                                     bool useHWAA,
                                     const SkMatrix& viewMatrix,
                                     const SkRect& rect) {
     ASSERT_SINGLE_OWNER_PRIV
     RETURN_IF_ABANDONED_PRIV
     SkDEBUGCODE(fDrawContext->validate();)
@@ skipping 672 matching lines @@
 
 void GrDrawContext::drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip& clip,
                               GrDrawBatch* batch) {
     ASSERT_SINGLE_OWNER
     RETURN_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::drawBatch");
 
     this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch);
 }