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>

tests/PathOpsExtendedTest.cpp

diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index 45699d7..a9923d6 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -452,7 +452,7 @@
 bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state,
                   const char* pathStr) {
     static SkMutex& simplifyDebugOut = *(new SkMutex);
-    SkPath::FillType fillType = useXor ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType;
+    SkPathFillType fillType = useXor ? SkPathFillType::kEvenOdd : SkPathFillType::kWinding;
     path.setFillType(fillType);
     state.fReporter->bumpTestCount();
     if (!Simplify(path, &out)) {
@@ -469,8 +469,8 @@
         std::string str;
         const char* pathPrefix = nullptr;
         const char* nameSuffix = nullptr;
-        if (fillType == SkPath::kEvenOdd_FillType) {
-            pathPrefix = "    path.setFillType(SkPath::kEvenOdd_FillType);\n";
+        if (fillType == SkPathFillType::kEvenOdd) {
+            pathPrefix = "    path.setFillType(SkPathFillType::kEvenOdd);\n";
             nameSuffix = "x";
         }
         const char testFunction[] = "testSimplify(reporter, path);";
@@ -772,12 +772,12 @@
     }
 }
 
-void PathOpsThreadState::outputProgress(const char* pathStr, SkPath::FillType pathFillType) {
+void PathOpsThreadState::outputProgress(const char* pathStr, SkPathFillType pathFillType) {
     const char testFunction[] = "testSimplify(path);";
     const char* pathPrefix = nullptr;
     const char* nameSuffix = nullptr;
-    if (pathFillType == SkPath::kEvenOdd_FillType) {
-        pathPrefix = "    path.setFillType(SkPath::kEvenOdd_FillType);\n";
+    if (pathFillType == SkPathFillType::kEvenOdd) {
+        pathPrefix = "    path.setFillType(SkPathFillType::kEvenOdd);\n";
         nameSuffix = "x";
     }
     appendTest(pathStr, pathPrefix, nameSuffix, testFunction, false, fPathStr);