diff options
author | Ben Wagner <bungeman@google.com> | 2018-07-18 21:27:57 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-18 21:28:02 +0000 |
commit | e9dd316a0000a0b2a0812701d80775c30c8eb8cc (patch) | |
tree | 01f5319306639afa21c32e780da57b01e2369a95 /tests | |
parent | 7c0998a130b5b1a64811defd17ab3266985515f4 (diff) |
Revert "Reland "Add some optimizations to PolyUtils""
This reverts commit 946c37057f2618af7eda34fd6d2dd8625a9e9b61.
Reason for revert: strict weak ordering: ((__x LT __y) && (__y LT __x)) != false
Original change's description:
> Reland "Add some optimizations to PolyUtils"
>
> This is a reland of 8bb0db3d07450880d346d808018708416c928657
>
> Original change's description:
> > Add some optimizations to PolyUtils
> >
> > * Switch inset/offset code to use a linked list rather than an array
> > * Use std::set to store active edge list for IsSimplePolygon rather than array
> > * Pre-alloc the priority queue for IsSimplePolygon
> > * When adding radial curves, expand the array all at once rather than pushing
> > one at a time.
> >
> > Bug: skia:
> > Change-Id: I692f8c29c500c41ec1d1be39d924d8a752676bf4
> > Reviewed-on: https://skia-review.googlesource.com/140787
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > Commit-Queue: Jim Van Verth <jvanverth@google.com>
>
> Bug: skia:
> Change-Id: I3f5d42cfb941deab2b28bed020b37ce199e91d3d
> Reviewed-on: https://skia-review.googlesource.com/142200
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: Ie8cdf2375613c51dedaf0d11125d6d22d88821df
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/142281
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/InsetConvexPolyTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/InsetConvexPolyTest.cpp b/tests/InsetConvexPolyTest.cpp index aaaf591620..facabb76fa 100644 --- a/tests/InsetConvexPolyTest.cpp +++ b/tests/InsetConvexPolyTest.cpp @@ -65,7 +65,7 @@ DEF_TEST(InsetConvexPoly, reporter) { // past full inset result = SkInsetConvexPolygon(rrectPoly.begin(), rrectPoly.count(), 75, &insetPoly); REPORTER_ASSERT(reporter, !result); - REPORTER_ASSERT(reporter, insetPoly.count() == 1); + REPORTER_ASSERT(reporter, insetPoly.count() == 0); // troublesome case SkTDArray<SkPoint> clippedRRectPoly; |