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>

tests/PathOpsOpCircleThreadedTest.cpp

diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
index 0ac492b..9358c0c 100644
--- a/tests/PathOpsOpCircleThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -16,20 +16,19 @@
 
 static void testOpCirclesMain(PathOpsThreadState* data) {
         SkASSERT(data);
-    const SkPathFillType fts[] = { SkPathFillType::kWinding, SkPathFillType::kEvenOdd };
     PathOpsThreadState& state = *data;
     SkString pathStr;
     for (int a = 0 ; a < 6; ++a) {
         for (int b = a + 1 ; b < 7; ++b) {
             for (int c = 0 ; c < 6; ++c) {
                 for (int d = c + 1 ; d < 7; ++d) {
-                    for (auto e : fts) {
-    for (auto f : fts) {
+                    for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
+    for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
         SkPath pathA, pathB;
-        pathA.setFillType(e);
+        pathA.setFillType((SkPath::FillType) e);
         pathA.addCircle(SkIntToScalar(state.fA), SkIntToScalar(state.fB), SkIntToScalar(state.fC),
                 state.fD ? SkPathDirection::kCW : SkPathDirection::kCCW);
-        pathB.setFillType(f);
+        pathB.setFillType((SkPath::FillType) f);
         pathB.addCircle(SkIntToScalar(a), SkIntToScalar(b), SkIntToScalar(c),
                 d ? SkPathDirection::kCW : SkPathDirection::kCCW);
         for (int op = 0 ; op <= kXOR_SkPathOp; ++op)    {
@@ -37,13 +36,13 @@
                 pathStr.printf("static void circlesOp%d(skiatest::Reporter* reporter,"
                         " const char* filename) {\n", loopNo);
                 pathStr.appendf("    SkPath path, pathB;\n");
-                pathStr.appendf("    path.setFillType(SkPathFillType::k%s);\n",
-                        e == SkPathFillType::kWinding ? "Winding" : e == SkPathFillType::kEvenOdd
+                pathStr.appendf("    path.setFillType(SkPath::k%s_FillType);\n",
+                        e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
                         ? "EvenOdd" : "?UNDEFINED");
                 pathStr.appendf("    path.addCircle(%d, %d, %d, %s);\n", state.fA, state.fB,
                         state.fC, state.fD ? "SkPathDirection::kCW" : "SkPathDirection::kCCW");
-                pathStr.appendf("    pathB.setFillType(SkPathFillType::k%s);\n",
-                        f == SkPathFillType::kWinding ? "Winding" : f == SkPathFillType::kEvenOdd
+                pathStr.appendf("    pathB.setFillType(SkPath::k%s_FillType);\n",
+                        f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
                         ? "EvenOdd" : "?UNDEFINED");
                 pathStr.appendf("    pathB.addCircle(%d, %d, %d, %s);\n", a, b,
                         c, d ? "SkPathDirection::kCW" : "SkPathDirection::kCCW");