commit 7d34dc7747a8f4ede89babc6052222e35d5b22e7
author Mike Reed <reed@google.com> Tue Nov 26 12:17:17 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 26 17:43:14 2019 +0000
tree 0a1dbbb6955f0c61909fdb179db2a030152a75e2
parent 17096c763c24816e6b299c1f8d652cad86f38c00

Revert "Revert "switch to new filltype for SkPath""

This reverts commit 3e7af41224eecf8393f3cdc08c4c9800b2321c20.

Change-Id: Id4f66b3956f4bdbe690db20fc478b7365ee89717
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256676
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

gm/linepaths.cpp

diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp
index 25ffde2..c4e6ffd 100644
--- a/gm/linepaths.cpp
+++ b/gm/linepaths.cpp
@@ -20,7 +20,7 @@
 
 static void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
                      const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
-                     SkPaint::Style style, SkPath::FillType fill,
+                     SkPaint::Style style, SkPathFillType fill,
                      SkScalar strokeWidth) {
         path.setFillType(fill);
         SkPaint paint;
@@ -37,14 +37,14 @@
 
 static void draw(SkCanvas* canvas, bool doClose) {
         struct FillAndName {
-            SkPath::FillType fFill;
+            SkPathFillType fFill;
             const char*      fName;
         };
         constexpr FillAndName gFills[] = {
-            {SkPath::kWinding_FillType, "Winding"},
-            {SkPath::kEvenOdd_FillType, "Even / Odd"},
-            {SkPath::kInverseWinding_FillType, "Inverse Winding"},
-            {SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
+            {SkPathFillType::kWinding, "Winding"},
+            {SkPathFillType::kEvenOdd, "Even / Odd"},
+            {SkPathFillType::kInverseWinding, "Inverse Winding"},
+            {SkPathFillType::kInverseEvenOdd, "Inverse Even / Odd"},
         };
         struct StyleAndName {
             SkPaint::Style fStyle;