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

diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index 11e375c..29aa16d 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -763,7 +763,7 @@
         workingPath = path;
     }
 
-    if (!IsDistanceFieldSupportedFillType(workingPath.getNewFillType())) {
+    if (!IsDistanceFieldSupportedFillType(workingPath.getFillType())) {
         return false;
     }
 
@@ -829,19 +829,15 @@
                 kOutside = 1
             } dfSign;
 
-            switch (workingPath.getNewFillType()) {
-                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.