commit 4241f5e0a8ac1b64f03972d90d5082b15e138c64
author Mike Reed <reed@google.com> Sat Sep 14 19:13:23 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Sep 14 19:13:44 2019 +0000
tree 43cc13b7505dd26d2003cf8b8cdb316b46d2d58f
parent e1af44498b6e40c448811e6efc4412272cc10ca7

Revert "add guard to switch to SkPathTypes"

This reverts commit e1af44498b6e40c448811e6efc4412272cc10ca7.

Reason for revert: breaking google3?

Original change's description:
> add guard to switch to SkPathTypes
> 
> Change-Id: I44d8b5ae8a5172d11a6d4cd9d994373dd3816d6f
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241278
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>

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

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

src/pathops/SkPathOpsAsWinding.cpp

diff --git a/src/pathops/SkPathOpsAsWinding.cpp b/src/pathops/SkPathOpsAsWinding.cpp
index c415087..80e52be 100644
--- a/src/pathops/SkPathOpsAsWinding.cpp
+++ b/src/pathops/SkPathOpsAsWinding.cpp
@@ -367,7 +367,7 @@
     const SkPath& fPath;
 };
 
-static bool set_result_path(SkPath* result, const SkPath& path, SkPathFillType fillType) {
+static bool set_result_path(SkPath* result, const SkPath& path, SkPath::FillType fillType) {
     *result = path;
     result->setFillType(fillType);
     return true;
@@ -377,13 +377,13 @@
     if (!path.isFinite()) {
         return false;
     }
-    SkPathFillType fillType = (SkPathFillType)path.getFillType();
-    if (fillType == SkPathFillType::kWinding
-            || fillType == SkPathFillType::kInverseWinding ) {
+    SkPath::FillType fillType = path.getFillType();
+    if (fillType == SkPath::kWinding_FillType
+            || fillType == SkPath::kInverseWinding_FillType ) {
         return set_result_path(result, path, fillType);
     }
-    fillType = path.isInverseFillType() ? SkPathFillType::kInverseWinding :
-            SkPathFillType::kWinding;
+    fillType = path.isInverseFillType() ? SkPath::kInverseWinding_FillType :
+            SkPath::kWinding_FillType;
     if (path.isEmpty() || path.isConvex()) {
         return set_result_path(result, path, fillType);
     }