Revert of Retract PipelineBuilder some more

src/gpu/batches/GrMSAAPathRenderer.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrMSAAPathRenderer.h"
 
 #include "GrAuditTrail.h"
 #include "GrBatchFlushState.h"
 #include "GrClip.h"
 #include "GrDefaultGeoProcFactory.h"
 #include "GrPathStencilSettings.h"
 #include "GrPathUtils.h"
+#include "GrPipelineBuilder.h"
 #include "GrMesh.h"
 #include "SkGeometry.h"
 #include "SkTraceEvent.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLUtil.h"
 #include "gl/GrGLVaryingHandler.h"
 #include "batches/GrRectBatchFactory.h"
@@ skipping 623 matching lines @@
                 }
             } else {
                 bounds = path.getBounds();
             }
             const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? SkMatrix::I() :
                                                                                viewMatrix;
             SkAutoTUnref<GrDrawBatch> batch(
                     GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM, bounds, nullptr,
                                                         &localMatrix));
 
-            drawContext->drawBatch(paint, clip, *passes[p], batch);
+            GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
+            pipelineBuilder.setUserStencil(passes[p]);
+
+            drawContext->drawBatch(pipelineBuilder, clip, batch);
         } else {
             SkAutoTUnref<MSAAPathBatch> batch(new MSAAPathBatch(paint.getColor(), path,
                                                                 viewMatrix, devBounds));
             if (!batch->isValid()) {
                 return false;
             }
 
-            SkTCopyOnFirstWrite<GrPaint> newPaint(paint);
+            GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
+            pipelineBuilder.setUserStencil(passes[p]);
             if (passCount > 1) {
-               newPaint.writable()->setXPFactory(GrDisableColorXPFactory::Make());
+                pipelineBuilder.setDisableColorXPFactory();
             }
 
-            drawContext->drawBatch(*newPaint, clip, *passes[p], batch);
+            drawContext->drawBatch(pipelineBuilder, clip, batch);
         }
     }
     return true;
 }
 
 bool GrMSAAPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
     // This path renderer only fills and relies on MSAA for antialiasing. Stroked shapes are
     // handled by passing on the original shape and letting the caller compute the stroked shape
     // which will have a fill style.
     return args.fShape->style().isSimpleFill() && !args.fAntiAlias;
@@ skipping 26 matching lines @@
 
     GrPaint paint;
     paint.setXPFactory(GrDisableColorXPFactory::Make());
     paint.setAntiAlias(args.fIsAA);
 
     this->internalDrawPath(args.fDrawContext, paint, GrUserStencilSettings::kUnused, *args.fClip,
                            *args.fViewMatrix, *args.fShape, true);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////