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 /src/pathops/SkPathOpsCubic.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 'src/pathops/SkPathOpsCubic.h')
| -rw-r--r-- | src/pathops/SkPathOpsCubic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pathops/SkPathOpsCubic.h b/src/pathops/SkPathOpsCubic.h index 16bca79533..9fd0f171e2 100644 --- a/src/pathops/SkPathOpsCubic.h +++ b/src/pathops/SkPathOpsCubic.h @@ -41,7 +41,7 @@ struct SkDCubic { return v03.dot(v01) > 0 && v03.dot(v02) > 0 && v03.dot(v13) > 0 && v03.dot(v23) > 0; } - static bool IsConic() { return false; } + static bool IsCubic() { return true; } const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < kPointCount); return fPts[n]; } SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < kPointCount); return fPts[n]; } |