commit 3e7af41224eecf8393f3cdc08c4c9800b2321c20
author Mike Reed <reed@google.com> Tue Nov 26 03:34:16 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 26 03:34:30 2019 +0000
tree dd3a207624299f2702368087ae32470c3bc01e45
parent 74f2fb558fc63ec698e5b3a1ba0c8c461c3e37d7

Revert "switch to new filltype for SkPath"

This reverts commit 3a50981a834b1502151038e3e511fe78805ab0e3.

Reason for revert: chrome win build found compile-problem in xpsdevice

Original change's description:
> switch to new filltype for SkPath
> 
> Change-Id: I7793324a9acf4afb0eb38c1e20fbb38eac25d636
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256102
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=fmalita@chromium.org,reed@google.com

Change-Id: Iacb3566da61c2512b9bd6b7e42b592febc85e031
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256530
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/pathops/SkPathOpsSimplify.cpp

diff --git a/src/pathops/SkPathOpsSimplify.cpp b/src/pathops/SkPathOpsSimplify.cpp
index 6c522f4..f079b50 100644
--- a/src/pathops/SkPathOpsSimplify.cpp
+++ b/src/pathops/SkPathOpsSimplify.cpp
@@ -140,8 +140,8 @@
 bool SimplifyDebug(const SkPath& path, SkPath* result
         SkDEBUGPARAMS(bool skipAssert) SkDEBUGPARAMS(const char* testName)) {
     // returns 1 for evenodd, -1 for winding, regardless of inverse-ness
-    SkPathFillType fillType = path.isInverseFillType() ? SkPathFillType::kInverseEvenOdd
-            : SkPathFillType::kEvenOdd;
+    SkPath::FillType fillType = path.isInverseFillType() ? SkPath::kInverseEvenOdd_FillType
+            : SkPath::kEvenOdd_FillType;
     if (path.isConvex()) {
         if (result != &path) {
             *result = path;