Revert of Fix NVPR assert for equivalent ovals

src/gpu/GrPath.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPath.h"
 
 namespace {
@@ skipping 18 matching lines @@
     memcpy(&builder[1], &pts, sizeof(pts));
     if (strokeDataCnt > 0) {
         stroke.asUniqueKeyFragment(&builder[kBaseData32Cnt]);
     }
     return true;
 }
 
 inline static bool compute_key_for_oval_path(const SkPath& path, const GrStrokeInfo& stroke,
                                              GrUniqueKey* key) {
     SkRect rect;
-    // Point order is significant when dashing, so we cannot devolve to a rect key.
-    if (stroke.isDashed() || !path.isOval(&rect)) {
+    if (!path.isOval(&rect)) {
         return false;
     }
     static_assert((sizeof(rect) % sizeof(uint32_t)) == 0 && sizeof(rect) > sizeof(uint32_t),
                   "rect_needs_padding");
 
     const int kBaseData32Cnt = 1 + sizeof(rect) / sizeof(uint32_t);
     int strokeDataCnt = stroke.computeUniqueKeyFragmentData32Cnt();
     static const GrUniqueKey::Domain kOvalPathDomain = GrUniqueKey::GenerateDomain();
     GrUniqueKey::Builder builder(key, kOvalPathDomain, kBaseData32Cnt + strokeDataCnt);
     builder[0] = path.getFillType();
@@ skipping 114 matching lines @@
 
     if (compute_key_for_simple_path(path, stroke, key)) {
         *outIsVolatile = false;
         return;
     }
 
     compute_key_for_general_path(path, stroke, key);
     *outIsVolatile = path.isVolatile();
 }
 
-#ifdef SK_DEBUG
-bool GrPath::isEqualTo(const SkPath& path, const GrStrokeInfo& stroke) const {
-    if (!fStroke.hasEqualEffect(stroke)) {
-        return false;
-    }
-
-    // We treat same-rect ovals as identical - but only when not dashing.
-    SkRect ovalBounds;
-    if (!fStroke.isDashed() && fSkPath.isOval(&ovalBounds)) {
-        SkRect otherOvalBounds;
-        return path.isOval(&otherOvalBounds) && ovalBounds == otherOvalBounds;
-    }
-
-    return fSkPath == path;
-}
-#endif
-