Remove two varieties of drawNonAARect from GrDrawTarget

gm/rrects.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 "gm.h"
 #if SK_SUPPORT_GPU
-#include "GrTest.h"
+#include "GrContext.h"
+#include "GrDrawContext.h"
+#include "batches/GrDrawBatch.h"
+#include "batches/GrRectBatchFactory.h"
 #include "effects/GrRRectEffect.h"
 #endif
 #include "SkDevice.h"
 #include "SkRRect.h"
 
 namespace skiagm {
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class RRectGM : public GM {
@@ skipping 36 matching lines @@
         return name;
     }
 
     SkISize onISize() override { return SkISize::Make(kImageWidth, kImageHeight); }
 
     void onDraw(SkCanvas* canvas) override {
         GrContext* context = nullptr;
 #if SK_SUPPORT_GPU
         GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
         context = rt ? rt->getContext() : nullptr;
+        SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(rt));
+        if (!drawContext) {
+            return;
+        }
 #endif
         if (kEffect_Type == fType && nullptr == context) {
             skiagm::GM::DrawGpuOnlyMessage(canvas);
             return;
         }
 
         SkPaint paint;
         if (kAA_Draw_Type == fType) {
             paint.setAntiAlias(true);
         }
@@ skipping 19 matching lines @@
 #ifdef SK_DEBUG
                 SkASSERT(kMaxTileBound.contains(fRRects[curRRect].getBounds()));
                 SkRect imageSpaceBounds = fRRects[curRRect].getBounds();
                 imageSpaceBounds.offset(SkIntToScalar(x), SkIntToScalar(y));
                 SkASSERT(kMaxImageBound.contains(imageSpaceBounds));
 #endif
                 canvas->save();
                     canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
                     if (kEffect_Type == fType) {
 #if SK_SUPPORT_GPU
-                        GrTestTarget tt;
-                        context->getTestTarget(&tt, rt);
-                        if (nullptr == tt.target()) {
-                            SkDEBUGFAIL("Couldn't get Gr test target.");
-                            return;
-                        }
                         GrPipelineBuilder pipelineBuilder;
                         pipelineBuilder.setXPFactory(
                             GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref();
 
                         SkRRect rrect = fRRects[curRRect];
                         rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
                         GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
                         SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType,
                                                                                    rrect));
                         if (fp) {
                             pipelineBuilder.addCoverageFragmentProcessor(fp);
                             pipelineBuilder.setRenderTarget(rt);
 
                             SkRect bounds = rrect.getBounds();
                             bounds.outset(2.f, 2.f);
 
-                            tt.target()->drawNonAARect(pipelineBuilder,
-                                                       0xff000000,
-                                                       SkMatrix::I(),
-                                                       bounds);
+                            SkAutoTUnref<GrDrawBatch> batch(
+                                    GrRectBatchFactory::CreateNonAAFill(0xff000000, SkMatrix::I(),
+                                                                        bounds, nullptr, nullptr));
+                            drawContext->internal_drawBatch(pipelineBuilder, batch);
                         } else {
                             drew = false;
                         }
 #endif
                     } else if (kBW_Clip_Type == fType || kAA_Clip_Type == fType) {
                         bool aaClip = (kAA_Clip_Type == fType);
                         canvas->clipRRect(fRRects[curRRect], SkRegion::kReplace_Op, aaClip);
                         canvas->drawRect(kMaxTileBound, paint);
                     } else {
                         canvas->drawRRect(fRRects[curRRect], paint);
@@ skipping 120 matching lines @@
 
 DEF_GM( return new RRectGM(RRectGM::kAA_Draw_Type); )
 DEF_GM( return new RRectGM(RRectGM::kBW_Draw_Type); )
 DEF_GM( return new RRectGM(RRectGM::kAA_Clip_Type); )
 DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); )
 #if SK_SUPPORT_GPU
 DEF_GM( return new RRectGM(RRectGM::kEffect_Type); )
 #endif
 
 }