From baaf439eb5d08097d794f13800e5bf7ce8885f95 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 15 Jun 2017 09:59:23 -0400 Subject: 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 Commit-Queue: Brian Salomon --- gm/texturedomaineffect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/texturedomaineffect.cpp') diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index d49e059c56..e54404ef64 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -18,7 +18,7 @@ #include "SkGradientShader.h" #include "effects/GrTextureDomain.h" #include "ops/GrDrawOp.h" -#include "ops/GrNonAAFillRectOp.h" +#include "ops/GrRectOpFactory.h" namespace skiagm { /** @@ -134,8 +134,8 @@ protected: const SkMatrix viewMatrix = SkMatrix::MakeTrans(x, y); grPaint.addColorFragmentProcessor(std::move(fp)); renderTargetContext->priv().testingOnly_addDrawOp( - GrNonAAFillRectOp::Make(std::move(grPaint), viewMatrix, renderRect, - nullptr, nullptr, GrAAType::kNone)); + GrRectOpFactory::MakeNonAAFill(std::move(grPaint), viewMatrix, + renderRect, GrAAType::kNone)); x += renderRect.width() + kTestPad; } y += renderRect.height() + kTestPad; -- cgit v1.2.3