| Index: tests/PathOpsExtendedTest.cpp
|
| diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
|
| index 93280d746df5dadaba4e6cfed4b730061c30b802..b85644dca5a854b55e7c55d3f7f315405fdb70df 100644
|
| --- a/tests/PathOpsExtendedTest.cpp
|
| +++ b/tests/PathOpsExtendedTest.cpp
|
| @@ -41,7 +41,6 @@ static const char* opSuffixes[] = {
|
| };
|
|
|
| static bool gShowPath = false;
|
| -static bool gComparePaths = true;
|
| static bool gComparePathsAssert = true;
|
| static bool gPathStrAssert = true;
|
|
|
| @@ -512,7 +511,7 @@ bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& st
|
| REPORTER_ASSERT(state.fReporter, 0);
|
| return false;
|
| }
|
| - if (!gComparePaths) {
|
| + if (!state.fReporter->verbose()) {
|
| return true;
|
| }
|
| int result = comparePaths(state.fReporter, path, out, *state.fBitmap);
|
| @@ -563,8 +562,8 @@ void DebugShowPath(const SkPath& a, const SkPath& b, SkPathOp shapeOp, const cha
|
| }
|
| #endif
|
|
|
| -bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
| - const SkPathOp shapeOp, const char* testName) {
|
| +static bool innerPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
| + const SkPathOp shapeOp, const char* testName, bool threaded) {
|
| #if DEBUG_SHOW_TEST_NAME
|
| if (testName == NULL) {
|
| SkDebugf("\n");
|
| @@ -581,6 +580,9 @@ bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
| REPORTER_ASSERT(reporter, 0);
|
| return false;
|
| }
|
| + if (threaded && !reporter->verbose()) {
|
| + return true;
|
| + }
|
| SkPath pathOut, scaledPathOut;
|
| SkRegion rgnA, rgnB, openClip, rgnOut;
|
| openClip.setRect(-16000, -16000, 16000, 16000);
|
| @@ -614,6 +616,16 @@ bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
| return result == 0;
|
| }
|
|
|
| +bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
| + const SkPathOp shapeOp, const char* testName) {
|
| + return innerPathOp(reporter, a, b, shapeOp, testName, false);
|
| +}
|
| +
|
| +bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
| + const SkPathOp shapeOp, const char* testName) {
|
| + return innerPathOp(reporter, a, b, shapeOp, testName, true);
|
| +}
|
| +
|
| int initializeTests(skiatest::Reporter* reporter, const char* test) {
|
| #ifdef SK_DEBUG
|
| gDebugMaxWindSum = 4;
|
|
|