| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 #include "PathOpsExtendedTest.h" | 7 #include "PathOpsExtendedTest.h" |
| 8 #include "PathOpsThreadedCommon.h" | 8 #include "PathOpsThreadedCommon.h" |
| 9 | 9 |
| 10 static void testOpCubicsMain(PathOpsThreadState* data) { | 10 static void testOpCubicsMain(PathOpsThreadState* data) { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 pathA.close(); | 49 pathA.close(); |
| 50 pathB.setFillType((SkPath::FillType) f); | 50 pathB.setFillType((SkPath::FillType) f); |
| 51 pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b)); | 51 pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b)); |
| 52 pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB
), | 52 pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB
), |
| 53 SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(
state.fC)); | 53 SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(
state.fC)); |
| 54 pathB.close(); | 54 pathB.close(); |
| 55 for (int op = 0 ; op <= kXOR_PathOp; ++op) { | 55 for (int op = 0 ; op <= kXOR_PathOp; ++op) { |
| 56 if (progress) { | 56 if (progress) { |
| 57 outputProgress(state.fPathStr, pathStr, (SkPathOp) op); | 57 outputProgress(state.fPathStr, pathStr, (SkPathOp) op); |
| 58 } | 58 } |
| 59 testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op); | 59 testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "cu
bics"); |
| 60 } | 60 } |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 } | 63 } |
| 64 } | 64 } |
| 65 } | 65 } |
| 66 } | 66 } |
| 67 } | 67 } |
| 68 | 68 |
| 69 DEF_TEST(PathOpsOpCubicsThreaded, reporter) { | 69 DEF_TEST(PathOpsOpCubicsThreaded, reporter) { |
| 70 int threadCount = initializeTests(reporter, "cubicOp"); | 70 int threadCount = initializeTests(reporter, "cubicOp"); |
| 71 PathOpsThreadedTestRunner testRunner(reporter, threadCount); | 71 PathOpsThreadedTestRunner testRunner(reporter, threadCount); |
| 72 for (int a = 0; a < 6; ++a) { // outermost | 72 for (int a = 0; a < 6; ++a) { // outermost |
| 73 for (int b = a + 1; b < 7; ++b) { | 73 for (int b = a + 1; b < 7; ++b) { |
| 74 for (int c = 0 ; c < 6; ++c) { | 74 for (int c = 0 ; c < 6; ++c) { |
| 75 for (int d = c + 1; d < 7; ++d) { | 75 for (int d = c + 1; d < 7; ++d) { |
| 76 *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreaded
Runnable, | 76 *testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreaded
Runnable, |
| 77 (&testOpCubicsMain, a, b, c, d, &testRunner)); | 77 (&testOpCubicsMain, a, b, c, d, &testRunner)); |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 if (!reporter->allowExtendedTest()) goto finish; | 80 if (!reporter->allowExtendedTest()) goto finish; |
| 81 } | 81 } |
| 82 } | 82 } |
| 83 finish: | 83 finish: |
| 84 testRunner.render(); | 84 testRunner.render(); |
| 85 ShowTestArray(); |
| 85 } | 86 } |
| OLD | NEW |