Fix GrDrawContextPriv::stencilRect

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 390 matching lines @@
                                     const GrClip& clip, 
                                     const SkMatrix& viewMatrix,
                                     const GrPath* path,
                                     GrPathRendering::FillType fill) {
     fDrawContext->getDrawTarget()->stencilPath(pipelineBuilder, fDrawContext,
                                                clip, viewMatrix, path, fill);
 }
 
 void GrDrawContextPriv::stencilRect(const GrFixedClip& clip,
                                     const GrUserStencilSettings* ss,
-                                    bool doAA,
+                                    bool useHWAA,
                                     const SkMatrix& viewMatrix,
                                     const SkRect& rect) {
     ASSERT_SINGLE_OWNER_PRIV
     RETURN_IF_ABANDONED_PRIV
     SkDEBUGCODE(fDrawContext->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fDrawContext->fAuditTrail, "GrDrawContext::stencilRect");
 
     AutoCheckFlush acf(fDrawContext->fDrawingManager);
 
     GrPaint paint;
-    paint.setAntiAlias(doAA);
+    paint.setAntiAlias(useHWAA);
     paint.setXPFactory(GrDisableColorXPFactory::Make());
 
-    bool useHWAA;
-    SkAutoTUnref<GrDrawBatch> batch(
-        fDrawContext->getFillRectBatch(paint, viewMatrix, rect, &useHWAA));
-    SkASSERT(batch);
+    SkASSERT(!useHWAA || fDrawContext->isStencilBufferMultisampled());
 
     GrPipelineBuilder pipelineBuilder(paint, useHWAA);
     pipelineBuilder.setUserStencil(ss);
 
+    SkAutoTUnref<GrDrawBatch> batch(
+        GrRectBatchFactory::CreateNonAAFill(SK_ColorWHITE, viewMatrix, rect, nullptr, nullptr));
+
     fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, fDrawContext, clip, batch);
 }
 
 bool GrDrawContextPriv::drawAndStencilRect(const GrFixedClip& clip,
                                            const GrUserStencilSettings* ss,
                                            SkRegion::Op op,
                                            bool invert,
                                            bool doAA,
                                            const SkMatrix& viewMatrix,
                                            const SkRect& rect) {
@@ skipping 621 matching lines @@
 
 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");
 
     this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch);
 }