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/GrClipStackClip.cpp

diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 3c10df9..63409c2 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -28,7 +28,7 @@
 #include "src/gpu/effects/GrRRectEffect.h"
 #include "src/gpu/effects/GrTextureDomain.h"
 #include "src/gpu/effects/generated/GrDeviceSpaceEffect.h"
-#include "src/gpu/geometry/GrStyledShape.h"
+#include "src/gpu/geometry/GrShape.h"
 
 typedef SkClipStack::Element Element;
 typedef GrReducedClip::InitialState InitialState;
@@ -131,7 +131,7 @@
                 needsStencil ? GrPathRendererChain::DrawType::kStencilAndColor
                              : GrPathRendererChain::DrawType::kColor;
 
-        GrStyledShape shape(path, GrStyle::SimpleFill());
+        GrShape shape(path, GrStyle::SimpleFill());
         GrPathRenderer::CanDrawPathArgs canDrawArgs;
         canDrawArgs.fCaps = context->priv().caps();
         canDrawArgs.fProxy = renderTargetContext->asRenderTargetProxy();
@@ -450,7 +450,7 @@
             SkPath clipPath;
             element->asDeviceSpacePath(&clipPath);
             clipPath.toggleInverseFillType();
-            GrStyledShape shape(clipPath, GrStyle::SimpleFill());
+            GrShape shape(clipPath, GrStyle::SimpleFill());
             helper.drawShape(shape, translate, SkRegion::kReplace_Op, aa, 0x00);
             continue;
         }
@@ -462,7 +462,7 @@
         } else {
             SkPath path;
             element->asDeviceSpacePath(&path);
-            GrStyledShape shape(path, GrStyle::SimpleFill());
+            GrShape shape(path, GrStyle::SimpleFill());
             helper.drawShape(shape, translate, (SkRegion::Op)op, aa, 0xFF);
         }
     }