commit f3f08af010eebdb9c1501bdf1b3d8e715298b05f
author Michael Ludwig <michaelludwig@google.com> Thu Apr 16 11:39:31 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 16 18:05:51 2020 +0000
tree 4ebd308df18c6ff454b11a7e1270de88c28c077b
parent 0dca28004792a73562b88723fb1570be11364e01

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>

src/gpu/GrReducedClip.cpp

diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 008e2ba..696dbc2 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -24,7 +24,7 @@
 #include "src/gpu/effects/GrConvexPolyEffect.h"
 #include "src/gpu/effects/GrRRectEffect.h"
 #include "src/gpu/effects/generated/GrAARectEffect.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
 
 /**
  * There are plenty of optimizations that could be added here. Maybe flips could be folded into
@@ -861,7 +861,7 @@
                 clipPath.toggleInverseFillType();
             }
 
-            GrShape shape(clipPath, GrStyle::SimpleFill());
+            GrStyledShape shape(clipPath, GrStyle::SimpleFill());
             GrPathRenderer::CanDrawPathArgs canDrawArgs;
             canDrawArgs.fCaps = context->priv().caps();
             canDrawArgs.fProxy = renderTargetContext->asRenderTargetProxy();
@@ -906,7 +906,7 @@
                                     GrAA(doStencilMSAA), element->getDeviceSpaceRect());
             } else {
                 if (!clipPath.isEmpty()) {
-                    GrShape shape(clipPath, GrStyle::SimpleFill());
+                    GrStyledShape shape(clipPath, GrStyle::SimpleFill());
                     if (canRenderDirectToStencil) {
                         GrPaint paint;
                         paint.setXPFactory(GrDisableColorXPFactory::Get());
@@ -945,7 +945,7 @@
                     stencil_device_rect(renderTargetContext, stencilClip, *pass,
                                         GrAA(doStencilMSAA), element->getDeviceSpaceRect());
                 } else {
-                    GrShape shape(clipPath, GrStyle::SimpleFill());
+                    GrStyledShape shape(clipPath, GrStyle::SimpleFill());
                     GrPaint paint;
                     paint.setXPFactory(GrDisableColorXPFactory::Get());
                     GrPathRenderer::DrawPathArgs args{context,