Retract PipelineBuilder from GrClip::apply

src/gpu/batches/GrStencilAndCoverPathRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrStencilAndCoverPathRenderer.h"
 #include "GrCaps.h"
@@ skipping 56 matching lines @@
     return path.release();
 }
 
 void GrStencilAndCoverPathRenderer::onStencilPath(const StencilPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrStencilAndCoverPathRenderer::onStencilPath");
     SkASSERT(!args.fIsAA || args.fDrawContext->isStencilBufferMultisampled());
     SkPath path;
     args.fShape->asPath(&path);
 
-    GrPaint paint;
-    paint.setXPFactory(GrDisableColorXPFactory::Make());
-    paint.setAntiAlias(args.fIsAA);
-
-    const GrPipelineBuilder pipelineBuilder(paint, args.fIsAA);
-
     SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, path, GrStyle::SimpleFill()));
-    args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder, *args.fClip,
-                                                     *args.fViewMatrix, p, p->getFillType());
+    args.fDrawContext->drawContextPriv().stencilPath(*args.fClip, nullptr, args.fIsAA,
+                                                     *args.fViewMatrix, p);
 }
 
 bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrStencilAndCoverPathRenderer::onDrawPath");
     SkASSERT(!args.fPaint->isAntiAlias() || args.fDrawContext->isStencilBufferMultisampled());
     SkASSERT(!args.fShape->style().strokeRec().isHairlineStyle());
 
     const SkMatrix& viewMatrix = *args.fViewMatrix;
 
@@ skipping 10 matching lines @@
                 // outside the clip. So we can't just fill where the user bits are 0. We also need
                 // to check that the clip bit is set.
                 GrUserStencilTest::kEqualIfInClip,
                 0xffff,
                 GrUserStencilOp::kKeep,
                 GrUserStencilOp::kZero,
                 0xffff>()
         );
 
         // fake inverse with a stencil and cover
-        {
-            GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fPaint->isAntiAlias());
-            pipelineBuilder.setUserStencil(&kInvertedCoverPass);
-
-            args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder, *args.fClip,
-                                                             viewMatrix, p, p->getFillType());
-        }
+        args.fDrawContext->drawContextPriv().stencilPath(*args.fClip,
+                                                         &kInvertedCoverPass,
+                                                         args.fPaint->isAntiAlias(),
+                                                         viewMatrix, p);
 
         SkMatrix invert = SkMatrix::I();
         SkRect bounds =
             SkRect::MakeLTRB(0, 0,
                              SkIntToScalar(args.fDrawContext->width()),
                              SkIntToScalar(args.fDrawContext->height()));
         SkMatrix vmi;
         // mapRect through persp matrix may not be correct
         if (!viewMatrix.hasPerspective() && viewMatrix.invert(&vmi)) {
             vmi.mapRect(&bounds);
@@ skipping 39 matching lines @@
         if (args.fAntiAlias) {
             SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
             pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
         }
 
         args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch);
     }
 
     return true;
 }