diff options
| author |  reed <reed@google.com> | 2015-03-24 13:55:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-24 13:55:33 -0700 |
| commit | 0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f (patch) | |
| tree | 994c85a8e418986415175ddccc71adf924df3846 /src/pathops/SkPathOpsTightBounds.cpp | |
| parent | 82dec0e16ae10026194ce45b67af931700510450 (diff) | |
Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/)
Reason for revert:
ASAN investigation
Original issue's description:
> pathops version two
>
> R=reed@google.com
>
> marked 'no commit' to attempt to get trybots to run
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/ccec0f958ffc71a9986d236bc2eb335cb2111119
TBR=caryclark@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1029993002
Diffstat (limited to 'src/pathops/SkPathOpsTightBounds.cpp')
| -rw-r--r-- | src/pathops/SkPathOpsTightBounds.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/pathops/SkPathOpsTightBounds.cpp b/src/pathops/SkPathOpsTightBounds.cpp index d03efeb173..0f63f396e7 100644 --- a/src/pathops/SkPathOpsTightBounds.cpp +++ b/src/pathops/SkPathOpsTightBounds.cpp @@ -8,16 +8,14 @@ #include "SkPathOpsCommon.h" bool TightBounds(const SkPath& path, SkRect* result) { - SkOpContour contour; - SkOpGlobalState globalState( NULL PATH_OPS_DEBUG_PARAMS(&contour)); // turn path into list of segments - SkChunkAlloc allocator(4096); // FIXME: constant-ize, tune - SkOpEdgeBuilder builder(path, &contour, &allocator, &globalState); - if (!builder.finish(&allocator)) { + SkTArray<SkOpContour> contours; + SkOpEdgeBuilder builder(path, contours); + if (!builder.finish()) { return false; } - SkTDArray<SkOpContour* > contourList; - MakeContourList(&contour, contourList, false, false); + SkTArray<SkOpContour*, true> contourList; + MakeContourList(contours, contourList, false, false); SkOpContour** currentPtr = contourList.begin(); result->setEmpty(); if (!currentPtr) { |