commit 72ab3461b7473c0375c68ae280530a5a8d27026d
author Michael Ludwig <michaelludwig@google.com> Mon Dec 10 12:43:36 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 11 16:33:35 2018 +0000
tree db9475e773943b776fbeae337d38f7e24d8e74d7
parent 46f40f42478c401661acd41f76c3409b90f2bcbd

Consolidate stroke-rect ops and use GrFillRectOp instead of GrNonAA/AARectOp

Bug: skia:
Change-Id: Iee57bc970a026de2ad5a0758153e9cbb20753fa1
Reviewed-on: https://skia-review.googlesource.com/c/173105
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

gn/gpu.gni

diff --git a/gn/gpu.gni b/gn/gpu.gni
index 55f9628..bfe8dc7 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -231,14 +231,12 @@
   "$_src/gpu/ops/GrAAConvexTessellator.h",
   "$_src/gpu/ops/GrAAConvexPathRenderer.cpp",
   "$_src/gpu/ops/GrAAConvexPathRenderer.h",
-  "$_src/gpu/ops/GrAAFillRectOp.cpp",
   "$_src/gpu/ops/GrAAFillRRectOp.cpp",
   "$_src/gpu/ops/GrAAFillRRectOp.h",
   "$_src/gpu/ops/GrAAHairLinePathRenderer.cpp",
   "$_src/gpu/ops/GrAAHairLinePathRenderer.h",
   "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp",
   "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.h",
-  "$_src/gpu/ops/GrAAStrokeRectOp.cpp",
   "$_src/gpu/ops/GrAtlasTextOp.cpp",
   "$_src/gpu/ops/GrAtlasTextOp.h",
   "$_src/gpu/ops/GrClearOp.cpp",
@@ -266,8 +264,6 @@
   "$_src/gpu/ops/GrFillRectOp.h",
   "$_src/gpu/ops/GrMeshDrawOp.cpp",
   "$_src/gpu/ops/GrMeshDrawOp.h",
-  "$_src/gpu/ops/GrNonAAFillRectOp.cpp",
-  "$_src/gpu/ops/GrNonAAStrokeRectOp.cpp",
   "$_src/gpu/ops/GrLatticeOp.cpp",
   "$_src/gpu/ops/GrLatticeOp.h",
   "$_src/gpu/ops/GrOp.cpp",
@@ -276,7 +272,6 @@
   "$_src/gpu/ops/GrOvalOpFactory.h",
   "$_src/gpu/ops/GrQuadPerEdgeAA.cpp",
   "$_src/gpu/ops/GrQuadPerEdgeAA.h",
-  "$_src/gpu/ops/GrRectOpFactory.h",
   "$_src/gpu/ops/GrRegionOp.cpp",
   "$_src/gpu/ops/GrRegionOp.h",
   "$_src/gpu/ops/GrSemaphoreOp.cpp",
@@ -287,6 +282,8 @@
   "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.h",
   "$_src/gpu/ops/GrSmallPathRenderer.cpp",
   "$_src/gpu/ops/GrSmallPathRenderer.h",
+  "$_src/gpu/ops/GrStrokeRectOp.cpp",
+  "$_src/gpu/ops/GrStrokeRectOp.h",
   "$_src/gpu/ops/GrTessellatingPathRenderer.cpp",
   "$_src/gpu/ops/GrTessellatingPathRenderer.h",
   "$_src/gpu/ops/GrTextureOp.cpp",