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>

src/gpu/GrSWMaskHelper.cpp

diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 141f357..fb66886 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "GrSWMaskHelper.h"
-
 #include "GrCaps.h"
 #include "GrContext.h"
 #include "GrContextPriv.h"
@@ -15,11 +14,9 @@
 #include "GrShape.h"
 #include "GrSurfaceContext.h"
 #include "GrTextureProxy.h"
-#include "ops/GrDrawOp.h"
-
 #include "SkDistanceFieldGen.h"
-
-#include "ops/GrNonAAFillRectOp.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 /*
  * Convert a boolean operation into a transfer mode code
@@ -176,7 +173,8 @@
     paint.addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(
             resourceProvider, std::move(proxy), nullptr, maskMatrix,
             GrSamplerParams::kNone_FilterMode));
-    renderTargetContext->addDrawOp(
-            clip, GrNonAAFillRectOp::Make(std::move(paint), SkMatrix::I(), dstRect, nullptr,
-                                          &invert, GrAAType::kNone, &userStencilSettings));
+    renderTargetContext->addDrawOp(clip,
+                                   GrRectOpFactory::MakeNonAAFillWithLocalMatrix(
+                                           std::move(paint), SkMatrix::I(), invert, dstRect,
+                                           GrAAType::kNone, &userStencilSettings));
 }