commit 3a50981a834b1502151038e3e511fe78805ab0e3
author Mike Reed <reed@google.com> Mon Nov 25 12:34:17 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 25 22:31:46 2019 +0000
tree c19d20661d2d0d578aa50f578acb7ecbb15d885a
parent 32d6c8d024367695f05ee8bd78a47abe6383aa0d

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>

src/gpu/GrDistanceFieldGenFromVector.cpp

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