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>
diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
index 2cfca49..ecb4f29 100644
--- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
@@ -36,7 +36,6 @@
int hx = h & 0x03;
int hy = h >> 2;
SkPath path, out;
- path.setFillType(SkPath::kWinding_FillType);
path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
path.lineTo(SkIntToScalar(bx), SkIntToScalar(by));
path.lineTo(SkIntToScalar(cx), SkIntToScalar(cy));
@@ -63,12 +62,12 @@
pathStr.appendf(" path.close();\n");
pathStr.appendf(" testPathSimplify(reporter, path, filename);\n");
pathStr.appendf("}\n");
- state.outputProgress(pathStr.c_str(), SkPath::kWinding_FillType);
+ state.outputProgress(pathStr.c_str(), SkPathFillType::kWinding);
}
testSimplify(path, false, out, state, pathStr.c_str());
- path.setFillType(SkPath::kEvenOdd_FillType);
+ path.setFillType(SkPathFillType::kEvenOdd);
if (state.fReporter->verbose()) {
- state.outputProgress(pathStr.c_str(), SkPath::kEvenOdd_FillType);
+ state.outputProgress(pathStr.c_str(), SkPathFillType::kEvenOdd);
}
testSimplify(path, true, out, state, pathStr.c_str());
}