commit baaf439eb5d08097d794f13800e5bf7ce8885f95
author Brian Salomon <bsalomon@google.com> Thu Jun 15 09:59:23 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 15 16:49:40 2017 +0000
tree 16c3edc2f01918e62fd58c7034d8885932452b67
parent 1a0882e7ee9c7929f0079d3b335efb9a664f605b

Revert "Revert "Converts remaining rect ops from GrLegacyMeshDrawOp to GrMeshDrawOp subclasses.""

This reverts commit a0485d94529905e76320b7aa941a0d94b5578ac2.

Bug: skia:
Change-Id: If50b2d1af285a6c3c943373bb7258b56e1af28d6
Reviewed-on: https://skia-review.googlesource.com/19961
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/ProcessorTest.cpp

diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 528dd61..7f9dff7 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -19,7 +19,7 @@
 #include "GrResourceProvider.h"
 #include "glsl/GrGLSLFragmentProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "ops/GrNonAAFillRectOp.h"
+#include "ops/GrRectOpFactory.h"
 #include "ops/GrTestMeshDrawOp.h"
 
 namespace {
@@ -270,9 +270,9 @@
     paint.addColorFragmentProcessor(std::move(fp));
     paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
 
-    auto op = GrNonAAFillRectOp::Make(std::move(paint), SkMatrix::I(),
-                                      SkRect::MakeWH(rtc->width(), rtc->height()), nullptr, nullptr,
-                                      GrAAType::kNone);
+    auto op = GrRectOpFactory::MakeNonAAFill(std::move(paint), SkMatrix::I(),
+                                             SkRect::MakeWH(rtc->width(), rtc->height()),
+                                             GrAAType::kNone);
     rtc->addDrawOp(GrNoClip(), std::move(op));
 }