| 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 int loopNo = 158; | 10 static int loopNo = 158; |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 f == SkPath::kWinding_FillType ? "Winding" : f == SkPath
::kEvenOdd_FillType | 57 f == SkPath::kWinding_FillType ? "Winding" : f == SkPath
::kEvenOdd_FillType |
| 58 ? "EvenOdd" : "?UNDEFINED"); | 58 ? "EvenOdd" : "?UNDEFINED"); |
| 59 str += sprintf(str, " pathB.moveTo(%d,%d);\n", a, b); | 59 str += sprintf(str, " pathB.moveTo(%d,%d);\n", a, b); |
| 60 str += sprintf(str, " pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n",
c, d, | 60 str += sprintf(str, " pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n",
c, d, |
| 61 state.fB, state.fA, state.fD, state.fC); | 61 state.fB, state.fA, state.fD, state.fC); |
| 62 str += sprintf(str, " pathB.close();\n"); | 62 str += sprintf(str, " pathB.close();\n"); |
| 63 str += sprintf(str, " testPathOp(reporter, path, pathB, %s, f
ilename);\n", | 63 str += sprintf(str, " testPathOp(reporter, path, pathB, %s, f
ilename);\n", |
| 64 SkPathOpsDebug::OpStr((SkPathOp) op)); | 64 SkPathOpsDebug::OpStr((SkPathOp) op)); |
| 65 str += sprintf(str, "}\n"); | 65 str += sprintf(str, "}\n"); |
| 66 } | 66 } |
| 67 if (!testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op
, "cubics")) { | 67 if (!testPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "cubic
s")) { |
| 68 if (progress) { | 68 if (progress) { |
| 69 ++loopNo; | 69 ++loopNo; |
| 70 goto skipToNext; | 70 goto skipToNext; |
| 71 } | 71 } |
| 72 } | 72 } |
| 73 } | 73 } |
| 74 } | 74 } |
| 75 } | 75 } |
| 76 skipToNext: ; | 76 skipToNext: ; |
| 77 } | 77 } |
| (...skipping 13 matching lines...) Expand all Loading... |
| 91 (&testOpCubicsMain, a, b, c, d, &testRunner)); | 91 (&testOpCubicsMain, a, b, c, d, &testRunner)); |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 if (!reporter->allowExtendedTest()) goto finish; | 94 if (!reporter->allowExtendedTest()) goto finish; |
| 95 } | 95 } |
| 96 } | 96 } |
| 97 finish: | 97 finish: |
| 98 testRunner.render(); | 98 testRunner.render(); |
| 99 ShowTestArray("cubicOp"); | 99 ShowTestArray("cubicOp"); |
| 100 } | 100 } |
| OLD | NEW |