commit 73b86c1ade1c002cfa4da66c33c25514737e2416
author Michael Ludwig <michaelludwig@google.com> Fri Apr 17 18:48:22 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Apr 17 19:38:34 2020 +0000
tree 5bfe5b27a3f992e74daef41ef502dd6928785183
parent 36a3e014e10850ff692e5fd65e8e4d0354505916

Revert "Rename GrShape to GrStyledShape"

This reverts commit f3f08af010eebdb9c1501bdf1b3d8e715298b05f.

Reason for revert: maybe this is breaking the ios perf bot; it is the first CL that caused the bot to fail, but I can't really say why this would break them.

Original change's description:
> Rename GrShape to GrStyledShape
> 
> Change-Id: Ic457e634b4b95356f5615cff3fce1ca7d7677c26
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284036
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>

TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I2e5adbfc820811fbbde9cb57af28f86a7ba40bd9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/284231
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>

src/gpu/ops/GrTriangulatingPathRenderer.cpp

diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index 0347f4e..b8ab235 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -23,7 +23,7 @@
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrTriangulator.h"
 #include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrStyledShape.h"
+#include "src/gpu/geometry/GrShape.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"
 #include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
 
@@ -170,7 +170,7 @@
 
     static std::unique_ptr<GrDrawOp> Make(GrRecordingContext* context,
                                           GrPaint&& paint,
-                                          const GrStyledShape& shape,
+                                          const GrShape& shape,
                                           const SkMatrix& viewMatrix,
                                           SkIRect devClipBounds,
                                           GrAAType aaType,
@@ -202,7 +202,7 @@
 
     TriangulatingPathOp(Helper::MakeArgs helperArgs,
                         const SkPMColor4f& color,
-                        const GrStyledShape& shape,
+                        const GrShape& shape,
                         const SkMatrix& viewMatrix,
                         const SkIRect& devClipBounds,
                         GrAAType aaType,
@@ -401,7 +401,7 @@
 
     Helper         fHelper;
     SkPMColor4f    fColor;
-    GrStyledShape  fShape;
+    GrShape        fShape;
     SkMatrix       fViewMatrix;
     SkIRect        fDevClipBounds;
     bool           fAntiAlias;
@@ -447,7 +447,7 @@
     do {
         GrTest::TestStyle(random, &style);
     } while (!style.isSimpleFill());
-    GrStyledShape shape(path, style);
+    GrShape shape(path, style);
     return TriangulatingPathOp::Make(context, std::move(paint), shape, viewMatrix, devClipBounds,
                                      aaType, GrGetRandomStencil(random, context));
 }