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

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index ed7227d..98c30bb 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -23,14 +23,14 @@
 #include "src/gpu/GrSWMaskHelper.h"
 #include "src/gpu/GrSurfaceContextPriv.h"
 #include "src/gpu/SkGr.h"
-#include "src/gpu/geometry/GrStyledShape.h"
+#include "src/gpu/geometry/GrShape.h"
 #include "src/gpu/ops/GrDrawOp.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 GrPathRenderer::CanDrawPath
 GrSoftwarePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
     // Pass on any style that applies. The caller will apply the style if a suitable renderer is
-    // not found and try again with the new GrStyledShape.
+    // not found and try again with the new GrShape.
     if (!args.fShape->style().applies() && SkToBool(fProxyProvider) &&
         (args.fAAType == GrAAType::kCoverage || args.fAAType == GrAAType::kNone)) {
         // This is the fallback renderer for when a path is too complicated for the GPU ones.
@@ -40,7 +40,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-static bool get_unclipped_shape_dev_bounds(const GrStyledShape& shape, const SkMatrix& matrix,
+static bool get_unclipped_shape_dev_bounds(const GrShape& shape, const SkMatrix& matrix,
                                            SkIRect* devBounds) {
     SkRect shapeBounds = shape.styledBounds();
     if (shapeBounds.isEmpty()) {
@@ -69,7 +69,7 @@
 // is no intersection.
 bool GrSoftwarePathRenderer::GetShapeAndClipBounds(GrRenderTargetContext* renderTargetContext,
                                                    const GrClip& clip,
-                                                   const GrStyledShape& shape,
+                                                   const GrShape& shape,
                                                    const SkMatrix& matrix,
                                                    SkIRect* unclippedDevShapeBounds,
                                                    SkIRect* clippedDevShapeBounds,
@@ -198,8 +198,8 @@
  */
 class SoftwarePathData {
 public:
-    SoftwarePathData(const SkIRect& maskBounds, const SkMatrix& viewMatrix,
-                     const GrStyledShape& shape, GrAA aa)
+    SoftwarePathData(const SkIRect& maskBounds, const SkMatrix& viewMatrix, const GrShape& shape,
+                     GrAA aa)
             : fMaskBounds(maskBounds)
             , fViewMatrix(viewMatrix)
             , fShape(shape)
@@ -207,13 +207,13 @@
 
     const SkIRect& getMaskBounds() const { return fMaskBounds; }
     const SkMatrix* getViewMatrix() const { return &fViewMatrix; }
-    const GrStyledShape& getShape() const { return fShape; }
+    const GrShape& getShape() const { return fShape; }
     GrAA getAA() const { return fAA; }
 
 private:
     SkIRect fMaskBounds;
     SkMatrix fViewMatrix;
-    GrStyledShape fShape;
+    GrShape fShape;
     GrAA fAA;
 };