Revert of Retract PipelineBuilder some more

src/gpu/GrSWMaskHelper.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 "GrSWMaskHelper.h"
 
 #include "GrCaps.h"
 #include "GrContext.h"
 #include "batches/GrDrawBatch.h"
 #include "GrDrawContext.h"
+#include "GrPipelineBuilder.h"
 #include "GrShape.h"
 
 #include "SkDistanceFieldGen.h"
 
 #include "batches/GrRectBatchFactory.h"
 
 /*
  * Convert a boolean operation into a transfer mode code
  */
 static SkXfermode::Mode op_to_mode(SkRegion::Op op) {
@@ skipping 149 matching lines @@
                                       SK_Scalar1 * rect.fRight,
                                       SK_Scalar1 * rect.fBottom);
 
     // We use device coords to compute the texture coordinates. We take the device coords and apply
     // a translation so that the top-left of the device bounds maps to 0,0, and then a scaling
     // matrix to normalized coords.
     SkMatrix maskMatrix;
     maskMatrix.setIDiv(texture->width(), texture->height());
     maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop));
 
-    SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(paint.getColor(),
-                                                                        SkMatrix::I(),
-                                                                        dstRect, nullptr, &invert));
+    GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
+    pipelineBuilder.setUserStencil(&userStencilSettings);
 
-    GrPaint newPaint(paint);
-    newPaint.addCoverageFragmentProcessor(
+    pipelineBuilder.addCoverageFragmentProcessor(
                          GrSimpleTextureEffect::Make(texture,
                                                      nullptr,
                                                      maskMatrix,
                                                      GrTextureParams::kNone_FilterMode,
                                                      kDevice_GrCoordSet));
 
-    drawContext->drawBatch(newPaint, clip, userStencilSettings, batch);
+    SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(paint.getColor(),
+                                                                        SkMatrix::I(),
+                                                                        dstRect, nullptr, &invert));
+    drawContext->drawBatch(pipelineBuilder, clip, batch);
 }