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>

src/pathops/SkOpBuilder.cpp

diff --git a/src/pathops/SkOpBuilder.cpp b/src/pathops/SkOpBuilder.cpp
index 9dac160..8a9eccd 100644
--- a/src/pathops/SkOpBuilder.cpp
+++ b/src/pathops/SkOpBuilder.cpp
@@ -36,11 +36,11 @@
 }
 
 bool SkOpBuilder::FixWinding(SkPath* path) {
-    SkPath::FillType fillType = path->getFillType();
-    if (fillType == SkPath::kInverseEvenOdd_FillType) {
-        fillType = SkPath::kInverseWinding_FillType;
-    } else if (fillType == SkPath::kEvenOdd_FillType) {
-        fillType = SkPath::kWinding_FillType;
+    SkPathFillType fillType = path->getNewFillType();
+    if (fillType == SkPathFillType::kInverseEvenOdd) {
+        fillType = SkPathFillType::kInverseWinding;
+    } else if (fillType == SkPathFillType::kEvenOdd) {
+        fillType = SkPathFillType::kWinding;
     }
     SkPathPriv::FirstDirection dir;
     if (one_contour(*path) && SkPathPriv::CheapComputeFirstDirection(*path, &dir)) {