Revert of Stop closing filled paths in GrShape

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 343 matching lines @@
             this->attemptToSimplifyRRect();
         } else if (Type::kLine == fType) {
             this->attemptToSimplifyLine();
         }
     } else {
         if (fInheritedKey.count() || this->path().isVolatile()) {
             fPathData.fGenID = 0;
         } else {
             fPathData.fGenID = this->path().getGenerationID();
         }
+        if (this->style().isSimpleFill()) {
+            this->path().close();
+            this->path().setIsVolatile(true);
+        }
         if (!this->style().hasNonDashPathEffect()) {
             if (this->style().strokeRec().getStyle() == SkStrokeRec::kStroke_Style ||
                 this->style().strokeRec().getStyle() == SkStrokeRec::kHairline_Style) {
                 // Stroke styles don't differentiate between winding and even/odd.
                 // Moreover, dashing ignores inverseness (skbug.com/5421)
                 bool inverse = !this->style().isDashed() && this->path().isInverseFillType();
                 if (inverse) {
                     this->path().setFillType(kDefaultPathInverseFillType);
                 } else {
                     this->path().setFillType(kDefaultPathFillType);
@@ skipping 104 matching lines @@
             fStyle = GrStyle::SimpleFill();
             return;
         }
     }
     // Only path effects could care about the order of the points. Otherwise canonicalize
     // the point order.
     if (pts[1].fY < pts[0].fY || (pts[1].fY == pts[0].fY && pts[1].fX < pts[0].fX)) {
         SkTSwap(pts[0], pts[1]);
     }
 }