Canonicalize path fill types for stroked paths in GrShape.

src/gpu/GrShape.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrShape_DEFINED
 #define GrShape_DEFINED
 
@@ skipping 172 matching lines @@
     void asPath(SkPath* out) const {
         switch (fType) {
             case Type::kEmpty:
                 out->reset();
                 break;
             case Type::kRRect:
                 out->reset();
                 out->addRRect(fRRect, fRRectDir, fRRectStart);
                 // Below matches the fill type that attemptToSimplifyPath uses.
                 if (fRRectIsInverted) {
-                    out->setFillType(SkPath::kInverseEvenOdd_FillType);
+                    out->setFillType(kDefaultPathInverseFillType);
                 } else {
-                    out->setFillType(SkPath::kEvenOdd_FillType);
+                    out->setFillType(kDefaultPathFillType);
                 }
                 break;
             case Type::kPath:
                 *out = *fPath.get();
                 break;
         }
     }
 
     /**
      * Returns whether the geometry is empty. Note that applying the style could produce a
@@ skipping 71 matching lines @@
 
     /**
      * Determines the key we should inherit from the input shape's geometry and style when
      * we are applying the style to create a new shape.
      */
     void setInheritedKey(const GrShape& parentShape, GrStyle::Apply, SkScalar scale);
 
     void attemptToSimplifyPath();
     void attemptToSimplifyRRect();
 
+    // Defaults to use when there is no distinction between even/odd and winding fills.
+    static constexpr SkPath::FillType kDefaultPathFillType = SkPath::kEvenOdd_FillType;
+    static constexpr SkPath::FillType kDefaultPathInverseFillType =
+            SkPath::kInverseEvenOdd_FillType;
+
     static constexpr SkPath::Direction kDefaultRRectDir = SkPath::kCW_Direction;
     static constexpr unsigned kDefaultRRectStart = 0;
 
     static unsigned DefaultRectDirAndStartIndex(const SkRect& rect, bool hasPathEffect,
                                                 SkPath::Direction* dir) {
         *dir = kDefaultRRectDir;
         // This comes from SkPath's interface. The default for adding a SkRect is counter clockwise
         // beginning at index 0 (which happens to correspond to rrect index 0 or 7).
         if (!hasPathEffect) {
             // It doesn't matter what start we use, just be consistent to avoid redundant keys.
@@ skipping 37 matching lines @@
     SkPath::Direction           fRRectDir;
     unsigned                    fRRectStart;
     bool                        fRRectIsInverted;
     SkTLazy<SkPath>             fPath;
     // Gen ID of the original path (fPath may be modified)
     int32_t                     fPathGenID = 0;
     GrStyle                     fStyle;
     SkAutoSTArray<8, uint32_t>  fInheritedKey;
 };
 #endif