diff options
| author |  caryclark <caryclark@google.com> | 2015-10-22 07:23:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-22 07:23:52 -0700 |
| commit | ed0935a28a29af7d3b16ac8d9365f291a335c6bd (patch) | |
| tree | f16bcde492ecfdbf19fcfcec9713c42e52326cb1 /src/pathops/SkPathOpsWinding.cpp | |
| parent | 7f53819ea9f8317b4bae1d54239b5b4c18240ef0 (diff) | |
Reland of path ops: fix conic weight and partial coincidence (patchset #1 id:1 of https://codereview.chromium.org/1408923003/ )
Reason for revert:
suppressions have landed in chrome
Original issue's description:
> Revert of path ops: fix conic weight and partial coincidence (patchset #5 id:80001 of https://codereview.chromium.org/1413763002/ )
>
> Reason for revert:
> path ops change breaks svg clipping layout tests -- conic is now more accurate, changing edge of circle in clip
>
> These need to be rebaselined
>
> svg/clip-path/clip-path-child-clipped.svg
> svg/clip-path/clip-path-nonzero.svg
> svg/clip-path/clip-path-evenodd-nonzero.svg
> svg/clip-path/clip-path-nonzero-evenodd.svg
>
> Original issue's description:
> > The remaining 1m skp bugs are asserts that can be harmlessly
> > suppressed and bugs around conics.
> >
> > The conic calculation for a subdivided w was just wrong.
> >
> > Also added debugging to template intersection to initialize
> > reused structures and dump additional data.
> >
> > TBR=reed@google.com
> >
> > Committed: https://skia.googlesource.com/skia/+/ef33b1e739b23a1201100ff17a572da85b03d9af
>
> TBR=
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/f428df1be3e96d3f8970d0f7f415b862f7da5404
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1407003016
Diffstat (limited to 'src/pathops/SkPathOpsWinding.cpp')
| -rw-r--r-- | src/pathops/SkPathOpsWinding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pathops/SkPathOpsWinding.cpp b/src/pathops/SkPathOpsWinding.cpp index 3061ea365a..0abffb0586 100644 --- a/src/pathops/SkPathOpsWinding.cpp +++ b/src/pathops/SkPathOpsWinding.cpp @@ -287,7 +287,7 @@ bool SkOpSpan::sortableTop(SkOpContour* contourHead) { return false; } bool ccw = ccw_dxdy(hit->fSlope, dir); - SkASSERT(!approximately_zero(hit->fT) || !hit->fValid); +// SkASSERT(!approximately_zero(hit->fT) || !hit->fValid); SkOpSpan* span = hit->fSpan; SkOpSegment* hitSegment = span->segment(); if (!span) { |