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>
diff --git a/src/gpu/ops/GrDefaultPathRenderer.h b/src/gpu/ops/GrDefaultPathRenderer.h
index e709964..a42061c 100644
--- a/src/gpu/ops/GrDefaultPathRenderer.h
+++ b/src/gpu/ops/GrDefaultPathRenderer.h
@@ -23,7 +23,7 @@
     const char* name() const final { return "Default"; }
 
 private:
-    StencilSupport onGetStencilSupport(const GrStyledShape&) const override;
+    StencilSupport onGetStencilSupport(const GrShape&) const override;
 
     CanDrawPath onCanDrawPath(const CanDrawPathArgs&) const override;
 
@@ -37,7 +37,7 @@
                           const GrUserStencilSettings&,
                           const GrClip&,
                           const SkMatrix& viewMatrix,
-                          const GrStyledShape&,
+                          const GrShape&,
                           bool stencilOnly);
 
     typedef GrPathRenderer INHERITED;