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/ccpr/GrCCPathCache.cpp

diff --git a/src/gpu/ccpr/GrCCPathCache.cpp b/src/gpu/ccpr/GrCCPathCache.cpp
index 4f29c90..b1037bb 100644
--- a/src/gpu/ccpr/GrCCPathCache.cpp
+++ b/src/gpu/ccpr/GrCCPathCache.cpp
@@ -126,13 +126,13 @@
     static constexpr int kStrokeCapJoinIdx = 2;
     static constexpr int kShapeUnstyledKeyIdx = 3;
 
-    WriteKeyHelper(const GrShape& shape) : fShapeUnstyledKeyCount(shape.unstyledKeySize()) {}
+    WriteKeyHelper(const GrStyledShape& shape) : fShapeUnstyledKeyCount(shape.unstyledKeySize()) {}
 
     // Returns the total number of uint32_t's to allocate for the key.
     int allocCountU32() const { return kShapeUnstyledKeyIdx + fShapeUnstyledKeyCount; }
 
     // Writes the key data to out[].
-    void write(const GrShape& shape, uint32_t* out) {
+    void write(const GrStyledShape& shape, uint32_t* out) {
         // Stroke key.
         // We don't use GrStyle::WriteKey() because it does not account for hairlines.
         // http://skbug.com/8273
@@ -161,7 +161,7 @@
 }
 
 GrCCPathCache::OnFlushEntryRef GrCCPathCache::find(
-        GrOnFlushResourceProvider* onFlushRP, const GrShape& shape,
+        GrOnFlushResourceProvider* onFlushRP, const GrStyledShape& shape,
         const SkIRect& clippedDrawBounds, const SkMatrix& viewMatrix, SkIVector* maskShift) {
     if (!shape.hasUnstyledKey()) {
         return OnFlushEntryRef();