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/gpu/GrDistanceFieldGenFromVector.cpp

diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index fc505e5..29aa16d 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -763,7 +763,7 @@
         workingPath = path;
     }
 
-    if (!IsDistanceFieldSupportedFillType((SkPathFillType)workingPath.getFillType())) {
+    if (!IsDistanceFieldSupportedFillType(workingPath.getFillType())) {
         return false;
     }
 
@@ -829,19 +829,15 @@
                 kOutside = 1
             } dfSign;
 
-            switch ((SkPathFillType)workingPath.getFillType()) {
-                case SkPathFillType::kWinding:
-                    dfSign = windingNumber ? kInside : kOutside;
-                    break;
-                case SkPathFillType::kInverseWinding:
-                    dfSign = windingNumber ? kOutside : kInside;
-                    break;
-                case SkPathFillType::kEvenOdd:
-                    dfSign = (windingNumber % 2) ? kInside : kOutside;
-                    break;
-                case SkPathFillType::kInverseEvenOdd:
-                    dfSign = (windingNumber % 2) ? kOutside : kInside;
-                    break;
+            if (workingPath.getFillType() == SkPath::kWinding_FillType) {
+                dfSign = windingNumber ? kInside : kOutside;
+            } else if (workingPath.getFillType() == SkPath::kInverseWinding_FillType) {
+                dfSign = windingNumber ? kOutside : kInside;
+            } else if (workingPath.getFillType() == SkPath::kEvenOdd_FillType) {
+                dfSign = (windingNumber % 2) ? kInside : kOutside;
+            } else {
+                SkASSERT(workingPath.getFillType() == SkPath::kInverseEvenOdd_FillType);
+                dfSign = (windingNumber % 2) ? kOutside : kInside;
             }
 
             // The winding number at the end of a scanline should be zero.