Remove two varieties of drawNonAARect from GrDrawTarget

gm/constcolorprocessor.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.
  */
 
 // This test only works with the GPU backend.
 
 #include "gm.h"
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
-#include "GrTest.h"
-#include "effects/GrConstColorProcessor.h"
+#include "GrDrawContext.h"
+#include "GrPipelineBuilder.h"
 #include "SkGrPriv.h"
 #include "SkGradientShader.h"
+#include "batches/GrDrawBatch.h"
+#include "batches/GrRectBatchFactory.h"
+#include "effects/GrConstColorProcessor.h"
 
 namespace skiagm {
 /**
  * This GM directly exercises GrConstColorProcessor.
  */
 class ConstColorProcessor : public GM {
 public:
     ConstColorProcessor() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
     }
@@ skipping 18 matching lines @@
         GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
         if (nullptr == rt) {
             return;
         }
         GrContext* context = rt->getContext();
         if (nullptr == context) {
             skiagm::GM::DrawGpuOnlyMessage(canvas);
             return;
         }
 
+        SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(rt));
+        if (!drawContext) {
+            return;
+        }
+
         static const GrColor kColors[] = {
             0xFFFFFFFF,
             0xFFFF00FF,
             0x80000000,
             0x00000000,
         };
 
         static const SkColor kPaintColors[] = {
             0xFFFFFFFF,
             0xFFFF0000,
@@ skipping 15 matching lines @@
             for (size_t procColor = 0; procColor < SK_ARRAY_COUNT(kColors); ++procColor) {
                 for (int m = 0; m < GrConstColorProcessor::kInputModeCnt; ++m) {
                     // translate by x,y for the canvas draws and the test target draws.
                     canvas->save();
                     canvas->translate(x, y);
                     const SkMatrix viewMatrix = SkMatrix::MakeTrans(x, y);
 
                     // rect to draw
                     SkRect renderRect = SkRect::MakeXYWH(0, 0, kRectSize, kRectSize);
 
-                    GrTestTarget tt;
-                    context->getTestTarget(&tt, rt);
-                    if (nullptr == tt.target()) {
-                        SkDEBUGFAIL("Couldn't get Gr test target.");
-                        return;
-                    }
-
                     GrPaint grPaint;
                     SkPaint skPaint;
                     if (paintType >= SK_ARRAY_COUNT(kPaintColors)) {
                         skPaint.setShader(fShader);
                     } else {
                         skPaint.setColor(kPaintColors[paintType]);
                     }
                     SkAssertResult(SkPaintToGrPaint(context, skPaint, viewMatrix, &grPaint));
 
                     GrConstColorProcessor::InputMode mode = (GrConstColorProcessor::InputMode) m;
                     GrColor color = kColors[procColor];
                     SkAutoTUnref<GrFragmentProcessor> fp(GrConstColorProcessor::Create(color, mode));
 
                     GrClip clip;
                     GrPipelineBuilder pipelineBuilder(grPaint, rt, clip);
                     pipelineBuilder.addColorFragmentProcessor(fp);
 
-                    tt.target()->drawNonAARect(pipelineBuilder,
-                                               grPaint.getColor(),
-                                               viewMatrix,
-                                               renderRect);
+                    SkAutoTUnref<GrDrawBatch> batch(
+                            GrRectBatchFactory::CreateNonAAFill(grPaint.getColor(), viewMatrix,
+                                                                renderRect, nullptr, nullptr));
+                    drawContext->internal_drawBatch(pipelineBuilder, batch);
 
                     // Draw labels for the input to the processor and the processor to the right of
                     // the test rect. The input label appears above the processor label.
                     SkPaint labelPaint;
                     sk_tool_utils::set_portable_typeface(&labelPaint);
                     labelPaint.setAntiAlias(true);
                     labelPaint.setTextSize(10.f);
                     SkString inputLabel;
                     inputLabel.set("Input: ");
                     if (paintType >= SK_ARRAY_COUNT(kPaintColors)) {
@@ skipping 57 matching lines @@
     typedef GM INHERITED;
 };
 
 const SkScalar ConstColorProcessor::kPad = 10.f;
 const SkScalar ConstColorProcessor::kRectSize = 20.f;
 
 DEF_GM(return new ConstColorProcessor;)
 }
 
 #endif