diff options
| author |  caryclark <caryclark@google.com> | 2015-03-24 13:47:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-24 13:47:57 -0700 |
| commit | 74c464a6af23cd9cd2437fbe1a75c4f9f400a213 (patch) | |
| tree | c6dfd104af80e68fe28c99a422618c74027ef110 /src/pathops/SkPathOpsOp.cpp | |
| parent | 7aa846c6837f527067e7ab5fdeacdbd502696382 (diff) | |
Revert of fix destructor order to fix build (patchset #1 id:1 of https://codereview.chromium.org/1033703002/)
Reason for revert:
working on asan fix
Original issue's description:
> fix destructor order to fix build
>
> TBR=reed
>
> Committed: https://skia.googlesource.com/skia/+/c207f9b2e8d6fb5386197fa8a8d258d2c4603418
TBR=reed@android.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1033803002
Diffstat (limited to 'src/pathops/SkPathOpsOp.cpp')
| -rw-r--r-- | src/pathops/SkPathOpsOp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pathops/SkPathOpsOp.cpp b/src/pathops/SkPathOpsOp.cpp index 3182ac363d..77ae2de778 100644 --- a/src/pathops/SkPathOpsOp.cpp +++ b/src/pathops/SkPathOpsOp.cpp @@ -261,7 +261,6 @@ static void dump_op(const SkPath& one, const SkPath& two, SkPathOp op) { #endif bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) { - SkChunkAlloc allocator(4096); // FIXME: add a constant expression here, tune SkOpContour contour; SkOpCoincidence coincidence; SkOpGlobalState globalState(&coincidence PATH_OPS_DEBUG_PARAMS(&contour)); @@ -289,6 +288,7 @@ bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) { SkPathOpsDebug::gSortCount = SkPathOpsDebug::gSortCountDefault; #endif // turn path into list of segments + SkChunkAlloc allocator(4096); // FIXME: add a constant expression here, tune SkOpEdgeBuilder builder(*minuend, &contour, &allocator, &globalState); if (builder.unparseable()) { return false; |