Revert of Retract PipelineBuilder some more

src/gpu/batches/GrMSAAPathRenderer.cpp

Index: src/gpu/batches/GrMSAAPathRenderer.cpp
diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp
index 23725446976711c92b800dd17899c4bfab83aae1..ec54f320dee333e2a65a3daa1d797262b2fdb8dc 100644
--- a/src/gpu/batches/GrMSAAPathRenderer.cpp
+++ b/src/gpu/batches/GrMSAAPathRenderer.cpp
@@ -13,6 +13,7 @@
 #include "GrDefaultGeoProcFactory.h"
 #include "GrPathStencilSettings.h"
 #include "GrPathUtils.h"
+#include "GrPipelineBuilder.h"
 #include "GrMesh.h"
 #include "SkGeometry.h"
 #include "SkTraceEvent.h"
@@ -656,7 +657,10 @@
                     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));
@@ -664,12 +668,13 @@
                 return false;
             }
 
-            SkTCopyOnFirstWrite<GrPaint> newPaint(paint);
+            GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
+            pipelineBuilder.setUserStencil(passes[p]);
             if (passCount > 1) {
-               newPaint.writable()->setXPFactory(GrDisableColorXPFactory::Make());
-            }
-
-            drawContext->drawBatch(*newPaint, clip, *passes[p], batch);
+                pipelineBuilder.setDisableColorXPFactory();
+            }
+
+            drawContext->drawBatch(pipelineBuilder, clip, batch);
         }
     }
     return true;