Revert of Retract PipelineBuilder some more

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 279 matching lines @@
 
 static bool should_apply_coverage_aa(const GrPaint& paint, GrRenderTarget* rt,
                                      bool* useHWAA = nullptr) {
     if (!paint.isAntiAlias()) {
         if (useHWAA) {
             *useHWAA = false;
         }
         return false;
     } else {
         if (useHWAA) {
-            *useHWAA = rt->isUnifiedMultisampled() || rt->hasMixedSamples();
+            *useHWAA = rt->isUnifiedMultisampled();
         }
-        return !rt->isUnifiedMultisampled() && !rt->hasMixedSamples();
+        return !rt->isUnifiedMultisampled();
     }
 }
 
 // Attempts to crop a rect and optional local rect to the clip boundaries.
 // Returns false if the draw can be skipped entirely.
 static bool crop_filled_rect(const GrRenderTarget* rt, const GrClip& clip,
                              const SkMatrix& viewMatrix, SkRect* rect,
                              SkRect* localRect = nullptr) {
     if (!viewMatrix.rectStaysRect()) {
         return true;
@@ skipping 301 matching lines @@
     }
 
     AutoCheckFlush acf(fDrawingManager);
     SkAutoTUnref<GrDrawBatch> batch;
     bool useHWAA;
 
     if (InstancedRendering* ir = this->getDrawTarget()->instancedRendering()) {
         batch.reset(ir->recordRect(croppedRect, viewMatrix, paint.getColor(), croppedLocalRect,
                                    paint.isAntiAlias(), fInstancedPipelineInfo, &useHWAA));
         if (batch) {
-            SkASSERT(useHWAA == this->mustUseHWAA(paint));
-            this->drawBatch(paint, clip, GrUserStencilSettings::kUnused, batch);
+            GrPipelineBuilder pipelineBuilder(paint, useHWAA);
+            this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch);
             return;
         }
     }
 
     if (should_apply_coverage_aa(paint, fRenderTarget.get(), &useHWAA) &&
         view_matrix_ok_for_aa_fill_rect(viewMatrix)) {
         batch.reset(GrAAFillRectBatch::CreateWithLocalRect(paint.getColor(), viewMatrix,
                                                            croppedRect, croppedLocalRect));
         if (batch) {
-            SkASSERT(useHWAA == this->mustUseHWAA(paint));
-            this->drawBatch(paint, clip, GrUserStencilSettings::kUnused, batch);
+            GrPipelineBuilder pipelineBuilder(paint, useHWAA);
+            this->drawBatch(pipelineBuilder, clip, batch);
+            return;
         }
     } else {
         this->drawNonAAFilledRect(clip, paint, viewMatrix, croppedRect, &croppedLocalRect,
                                   nullptr, nullptr);
     }
+
 }
 
 void GrDrawContext::fillRectWithLocalMatrix(const GrClip& clip,
                                             const GrPaint& paint,
                                             const SkMatrix& viewMatrix,
                                             const SkRect& rectToDraw,
                                             const SkMatrix& localMatrix) {
     ASSERT_SINGLE_OWNER
     RETURN_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
@@ skipping 579 matching lines @@
     args.fUserStencilSettings = &GrUserStencilSettings::kUnused;
     args.fDrawContext = this;
     args.fClip = &clip;
     args.fViewMatrix = &viewMatrix;
     args.fShape = canDrawArgs.fShape;
     args.fAntiAlias = useCoverageAA;
     args.fGammaCorrect = this->isGammaCorrect();
     pr->drawPath(args);
 }
 
-void GrDrawContext::drawBatch(const GrPaint& paint,
-                              const GrClip& clip,
-                              const GrUserStencilSettings& userStencilSettings,
-                              GrDrawBatch* batch,
-                              GrDrawFace drawFace) {
+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");
 
-    GrPipelineBuilder pipelineBuilder(paint, this->mustUseHWAA(paint));
-    pipelineBuilder.setUserStencil(&userStencilSettings);
-    pipelineBuilder.setDrawFace(drawFace);
-
     this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch);
 }