diff options
| author |  caryclark <caryclark@google.com> | 2015-10-21 04:02:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-21 04:02:51 -0700 |
| commit | f428df1be3e96d3f8970d0f7f415b862f7da5404 (patch) | |
| tree | f31420ca0e99b23383577dc8ebdce3167b637317 /tests/PathOpsTSectDebug.h | |
| parent | 74deb981d5e9c11c88fe431e78166d6cf8dacc1a (diff) | |
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
Review URL: https://codereview.chromium.org/1408923003
Diffstat (limited to 'tests/PathOpsTSectDebug.h')
| -rw-r--r-- | tests/PathOpsTSectDebug.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/PathOpsTSectDebug.h b/tests/PathOpsTSectDebug.h index 68ef4b7db1..9db904d06b 100644 --- a/tests/PathOpsTSectDebug.h +++ b/tests/PathOpsTSectDebug.h @@ -8,14 +8,6 @@ #include "SkPathOpsTSect.h" template<typename TCurve, typename OppCurve> -char SkTCoincident<TCurve, OppCurve>::dumpIsCoincidentStr() const { - if (!!fCoincident != fCoincident) { - return '?'; - } - return fCoincident ? '*' : 0; -} - -template<typename TCurve, typename OppCurve> void SkTCoincident<TCurve, OppCurve>::dump() const { SkDebugf("t=%1.9g pt=(%1.9g,%1.9g)%s\n", fPerpT, fPerpPt.fX, fPerpPt.fY, fCoincident ? " coincident" : ""); @@ -209,13 +201,11 @@ void SkTSpan<TCurve, OppCurve>::dumpCoin() const { template<typename TCurve, typename OppCurve> void SkTSpan<TCurve, OppCurve>::dumpID() const { - char cS = fCoinStart.dumpIsCoincidentStr(); - if (cS) { - SkDebugf("%c", cS); + if (fCoinStart.isCoincident()) { + SkDebugf("%c", '*'); } SkDebugf("%d", debugID()); - char cE = fCoinEnd.dumpIsCoincidentStr(); - if (cE) { - SkDebugf("%c", cE); + if (fCoinEnd.isCoincident()) { + SkDebugf("%c", '*'); } } |