commit 7d34dc7747a8f4ede89babc6052222e35d5b22e7
author Mike Reed <reed@google.com> Tue Nov 26 12:17:17 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 26 17:43:14 2019 +0000
tree 0a1dbbb6955f0c61909fdb179db2a030152a75e2
parent 17096c763c24816e6b299c1f8d652cad86f38c00

Revert "Revert "switch to new filltype for SkPath""

This reverts commit 3e7af41224eecf8393f3cdc08c4c9800b2321c20.

Change-Id: Id4f66b3956f4bdbe690db20fc478b7365ee89717
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/256676
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

gm/complexclip.cpp

diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index 3e53783..944251a 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -68,9 +68,9 @@
             .lineTo(50,  150)
             .close();
         if (fInvertDraw) {
-            path.setFillType(SkPath::kInverseEvenOdd_FillType);
+            path.setFillType(SkPathFillType::kInverseEvenOdd);
         } else {
-            path.setFillType(SkPath::kEvenOdd_FillType);
+            path.setFillType(SkPathFillType::kEvenOdd);
         }
         SkPaint pathPaint;
         pathPaint.setAntiAlias(true);
@@ -126,10 +126,10 @@
                 bool doInvB = SkToBool(invBits & 2);
                 canvas->save();
                     // set clip
-                    clipA.setFillType(doInvA ? SkPath::kInverseEvenOdd_FillType :
-                                      SkPath::kEvenOdd_FillType);
-                    clipB.setFillType(doInvB ? SkPath::kInverseEvenOdd_FillType :
-                                      SkPath::kEvenOdd_FillType);
+                    clipA.setFillType(doInvA ? SkPathFillType::kInverseEvenOdd :
+                                      SkPathFillType::kEvenOdd);
+                    clipB.setFillType(doInvB ? SkPathFillType::kInverseEvenOdd :
+                                      SkPathFillType::kEvenOdd);
                     canvas->clipPath(clipA, fDoAAClip);
                     canvas->clipPath(clipB, gOps[op].fOp, fDoAAClip);