Canonicalize path fill types for stroked 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 314 matching lines @@
         }
         if (this->style().isSimpleFill()) {
             // Filled paths are treated as though all their contours were closed.
             // Since SkPath doesn't track individual contours, this will only close the last. :(
             // There is no point in closing lines, though, since they loose their line-ness.
             if (!fPath.get()->isLine(nullptr)) {
                 fPath.get()->close();
                 fPath.get()->setIsVolatile(true);
             }
         }
-        if (fPath.get()->isConvex()) {
-            // There is no distinction between even/odd and non-zero winding count for convex
-            // paths.
-            if (fPath.get()->isInverseFillType()) {
-               fPath.get()->setFillType(SkPath::kInverseEvenOdd_FillType);
-            } else {
-                fPath.get()->setFillType(SkPath::kEvenOdd_FillType);
-            }
-        }
-        if (this->style().isDashed()) {
-            // Dashing ignores inverseness (skbug.com/5421)
-            switch (fPath.get()->getFillType()) {
-                case SkPath::kWinding_FillType:
-                case SkPath::kEvenOdd_FillType:
-                    break;
-                case SkPath::kInverseWinding_FillType:
-                    fPath.get()->setFillType(SkPath::kWinding_FillType);
-                    break;
-                case SkPath::kInverseEvenOdd_FillType:
-                    fPath.get()->setFillType(SkPath::kEvenOdd_FillType);
-                    break;
+        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)

[robertphillips, 2016/06/23 18:47:54]

why fStyle here and not style() ?

+                bool inverse = !this->fStyle.isDashed() && fPath.get()->isInverseFillType();
+                if (inverse) {
+                    fPath.get()->setFillType(kDefaultPathInverseFillType);
+                } else {
+                    fPath.get()->setFillType(kDefaultPathFillType);
+                }
+            } else if (fPath.get()->isConvex()) {
+                // There is no distinction between even/odd and non-zero winding count for convex
+                // paths.
+                if (fPath.get()->isInverseFillType()) {
+                    fPath.get()->setFillType(kDefaultPathInverseFillType);
+                } else {
+                    fPath.get()->setFillType(kDefaultPathFillType);
+                }
             }
         }
     }
 }
 
 void GrShape::attemptToSimplifyRRect() {
     SkASSERT(Type::kRRect == fType);
     SkASSERT(!fInheritedKey.count());
     if (fRRect.isEmpty()) {
         fType = Type::kEmpty;
         return;
     }
     if (!this->style().hasPathEffect()) {
         fRRectDir = kDefaultRRectDir;
         fRRectStart = kDefaultRRectStart;
     } else if (fStyle.isDashed()) {
         // Dashing ignores the inverseness (currently). skbug.com/5421
         fRRectIsInverted = false;
     }
 }