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/PathOpsAngleTest.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/PathOpsAngleTest.cpp')
-rw-r--r-- | tests/PathOpsAngleTest.cpp | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp index a598aea949..d5285c8fbc 100644 --- a/tests/PathOpsAngleTest.cpp +++ b/tests/PathOpsAngleTest.cpp @@ -478,67 +478,6 @@ DEF_TEST(PathOpsAngleAfter, reporter) { } } -static void offset_start(SkOpAngle* angle, const SkPoint* line, bool offsetStart) { - SkDPoint* pt = angle->debugFirstPt(); - if (!offsetStart) { - pt->fX = pt->fY = 0; - return; - } - pt->fX = line[1].fX * 0.001f; - pt->fY = line[1].fY * 0.001f; -} - -// test if offset line edges return the same results as edges without offsets -DEF_TEST(PathOpsOffsetLineAngle, reporter) { - static SkPoint radialLines[][2] = { - { {0, 0}, { 2, -1} }, { {0, 0}, { 2, -2} }, { {0, 0}, { 1, -2} }, { {0, 0}, { 0, -2} }, - { {0, 0}, {-1, -2} }, { {0, 0}, {-2, -2} }, { {0, 0}, {-2, -1} }, { {0, 0}, {-2, 0} }, - { {0, 0}, {-2, 1} }, { {0, 0}, {-2, 2} }, { {0, 0}, {-1, 2} }, { {0, 0}, { 0, 2} }, - { {0, 0}, { 1, 2} }, { {0, 0}, { 2, 2} }, { {0, 0}, { 2, 1} }, { {0, 0}, { 2, 0} }, - }; - SkChunkAlloc allocator(4096); - SkOpContourHead contour; - SkOpGlobalState state(&contour, &allocator SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr)); - contour.init(&state, false, false); - for (int lh = 0; lh < 16; ++lh) { - for (int mid = 0; mid < 16; ++mid) { - if (lh == mid) { - continue; - } - for (int rh = 0; rh < 16; ++rh) { - if (lh == rh || mid == rh) { - continue; - } - allocator.reset(); - contour.reset(); - contour.addLine(radialLines[lh]); - contour.addLine(radialLines[mid]); - contour.addLine(radialLines[rh]); - SkOpSegment* seg1 = contour.first(); - seg1->debugAddAngle(0, 1); - SkOpSegment* seg2 = seg1->next(); - seg2->debugAddAngle(0, 1); - SkOpSegment* seg3 = seg2->next(); - seg3->debugAddAngle(0, 1); - SkOpAngle* angle1 = seg1->debugLastAngle(); - SkOpAngle* angle2 = seg2->debugLastAngle(); - SkOpAngle* angle3 = seg3->debugLastAngle(); - PathOpsAngleTester::SetNext(*angle1, *angle3); - /* int expected = */ PathOpsAngleTester::After(*angle2, *angle1); - for (int test = 1; test <= 8; ++test) { - offset_start(angle1, radialLines[lh], test & 1); - offset_start(angle2, radialLines[mid], test & 2); - offset_start(angle3, radialLines[rh], test & 4); - /* int found = */ PathOpsAngleTester::After(*angle2, *angle1); -#if 0 // this test fails; haven't explored if this is a real bug or not - REPORTER_ASSERT(reporter, expected == found); -#endif - } - } - } - } -} - void SkOpSegment::debugAddAngle(double startT, double endT) { SkOpPtT* startPtT = startT == 0 ? fHead.ptT() : startT == 1 ? fTail.ptT() : this->addT(startT); |