Make GrShape use the original path when path effect fails.

src/gpu/GrShape.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrShape.h"
 
 GrShape& GrShape::operator=(const GrShape& that) {
@@ skipping 186 matching lines @@
             srcForPathEffect = parent.fPath.get();
         } else {
             srcForPathEffect = tmpPath.init();
             parent.asPath(tmpPath.get());
         }
         // Should we consider bounds? Would have to include in key, but it'd be nice to know
         // if the bounds actually modified anything before including in key.
         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.
         SkASSERT(scale == strokeRec.getResScale());
         if (GrStyle::Apply::kPathEffectAndStrokeRec == apply) {
             if (strokeRec.needToApply()) {
                 // The intermediate shape may not be a general path. If we we're just applying
                 // the path effect then attemptToReduceFromPath would catch it. This means that
                 // when we subsequently applied the remaining strokeRec we would have a non-path
                 // parent shape that would be used to determine the the stroked path's key.
@@ skipping 92 matching lines @@
                 rrect->setRect(rect);
                 // Since there is no path effect the dir and start index is immaterial.
                 *rrectDir = kDefaultRRectDir;
                 *rrectStart = kDefaultRRectStart;
                 return Type::kRRect;
             }
         }
     }
     return Type::kPath;
 }