Make GrShape use the original path when path effect fails.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2044793002

Review-Url: https://codereview.chromium.org/2044793002

1 files changed, 10 insertions, 5 deletions

diff --git a/src/gpu/GrShape.cpp b/src/gpu/GrShape.cpp
index 9fcc6ee911..7605cbf1ff 100644
--- a/src/gpu/GrShape.cpp
+++ b/src/gpu/GrShape.cpp
@@ -204,11 +204,16 @@ GrShape::GrShape(const GrShape& parent, GrStyle::Apply apply, SkScalar scale) {
         SkStrokeRec strokeRec = parent.fStyle.strokeRec();
         strokeRec.setResScale(scale);
         if (!pe->filterPath(fPath.get(), *srcForPathEffect, &strokeRec, nullptr)) {
-            // Make an empty unstyled shape if filtering fails.
-            fType = Type::kEmpty;
-            fStyle = GrStyle();
-            fPath.reset();
-            return;
+            // If the path effect fails then we continue as though there was no path effect.
+            // If the original was a rrect that we couldn't canonicalize because of the path
+            // effect, then do so now.
+            if (parent.fType == Type::kRRect && (parent.fRRectDir != kDefaultRRectDir ||
+                                                 parent.fRRectStart != kDefaultRRectStart)) {
+                SkASSERT(srcForPathEffect == tmpPath.get());
+                tmpPath.get()->reset();
+                tmpPath.get()->addRRect(parent.fRRect, kDefaultRRectDir, kDefaultRRectDir);
+            }
+            *fPath.get() = *srcForPathEffect;
         }
         // A path effect has access to change the res scale but we aren't expecting it to and it
         // would mess up our key computation.