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/ops/GrDefaultPathRenderer.cpp

diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index 332560c..7f4f634 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -24,7 +24,7 @@
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrSurfaceContextPriv.h"
 #include "src/gpu/geometry/GrPathUtils.h"
-#include "src/gpu/geometry/GrShape.h"
+#include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"
 #include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h"
 
@@ -36,7 +36,7 @@
 
 #define STENCIL_OFF     0   // Always disable stencil (even when needed)
 
-static inline bool single_pass_shape(const GrShape& shape) {
+static inline bool single_pass_shape(const GrStyledShape& shape) {
 #if STENCIL_OFF
     return true;
 #else
@@ -55,7 +55,7 @@
 }
 
 GrPathRenderer::StencilSupport
-GrDefaultPathRenderer::onGetStencilSupport(const GrShape& shape) const {
+GrDefaultPathRenderer::onGetStencilSupport(const GrStyledShape& shape) const {
     if (single_pass_shape(shape)) {
         return GrPathRenderer::kNoRestriction_StencilSupport;
     } else {
@@ -539,7 +539,7 @@
                                              const GrUserStencilSettings& userStencilSettings,
                                              const GrClip& clip,
                                              const SkMatrix& viewMatrix,
-                                             const GrShape& shape,
+                                             const GrStyledShape& shape,
                                              bool stencilOnly) {
     auto context = renderTargetContext->surfPriv().getContext();