diff options
| author |  Cary Clark <caryclark@google.com> | 2017-01-23 14:38:52 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-23 15:31:25 +0000 |
| commit | 59d5a0e3f560da40e0ae7036a01d7d58ce3718d8 (patch) | |
| tree | 55a3467bdbbda58dc30eca902d20130a2a20346d /tests/PathOpsIssue3651.cpp | |
| parent | b07a01e6b9bd552bab12aabd48dc77a7562f4f97 (diff) | |
Revert "offset angle check edge in common"
This reverts commit d2eb581ebc8f8009e80cccccd74d5b341ef5bd5b.
Reason for revert: broke Google3 MSAN run of dm
Original change's description:
> offset angle check edge in common
>
> When curves cross, their intersection points may be nearby, but not exactly the same.
> Sort the angles formed by the crossing curves when all angles don't have the same
> origin.
>
> This sets up the framework to solve test case that currently fail (e.g., joel6) but
> does not fix all related test cases (e.g., joel9).
>
> All older existing test cases, including extended tests, pass.
>
> Rework the test framework to better report when tests expected to produce failing
> results now pass.
>
> Add new point and vector operations to support offset angles.
>
> TBR=reed@google.com
> BUG=skia:6041
>
> Change-Id: I67c651ded0a25e99ad93d55d6a35109b3ee3698e
> Reviewed-on: https://skia-review.googlesource.com/6624
> Commit-Queue: Cary Clark <caryclark@google.com>
> Reviewed-by: Cary Clark <caryclark@google.com>
>
TBR=caryclark@google.com,reviews@skia.org
# Not skipping CQ checks because original CL landed > 1 day ago.
BUG=skia:6041
Change-Id: I43db0808522ac44aceeb4f70e296167ea84a3663
Reviewed-on: https://skia-review.googlesource.com/7373
Commit-Queue: Cary Clark <caryclark@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Diffstat (limited to 'tests/PathOpsIssue3651.cpp')
| -rw-r--r-- | tests/PathOpsIssue3651.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/PathOpsIssue3651.cpp b/tests/PathOpsIssue3651.cpp index dc93657d08..bd4ed2d9ab 100644 --- a/tests/PathOpsIssue3651.cpp +++ b/tests/PathOpsIssue3651.cpp @@ -472,7 +472,9 @@ path.close(); static void issue3651_1a(skiatest::Reporter* reporter, const char* filename) { SkPath path = path1_a(); SkPath pathB = path2_a(); - testPathOpTry(reporter, path, pathB, SkPathOp::kUnion_SkPathOp, filename); + // DEBUG_UNDER_DEVELOPMENT issue3651_1a disable expectation check for now + testPathOpCheck(reporter, path, pathB, SkPathOp::kUnion_SkPathOp, filename, + !SkOpGlobalState::DebugRunFail()); } static SkPath path3() { @@ -1202,7 +1204,9 @@ path.close(); static void issue3651_1(skiatest::Reporter* reporter, const char* filename) { SkPath path = path1(); SkPath pathB = path2(); - testPathOpTry(reporter, path, pathB, SkPathOp::kUnion_SkPathOp, filename); + // DEBUG_UNDER_DEVELOPMENT issue3651_1 disable expectation check for now + testPathOpCheck(reporter, path, pathB, SkPathOp::kUnion_SkPathOp, filename, + !SkOpGlobalState::DebugRunFail()); } static void issue3651_2(skiatest::Reporter* reporter, const char* filename) { |