diff options
| author |  Derek Sollenberger <djsollen@google.com> | 2017-03-07 11:14:59 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-07 11:15:10 +0000 |
| commit | c0a4c4f969464ec9854d726836a430262351d63d (patch) | |
| tree | e62c137641eb1002dbaa91c3b52335e23fbdf48f /src/pathops/SkPathOpsTypes.cpp | |
| parent | f3b16d01e36574d1a0ddf73975a5f72963727aa4 (diff) | |
Revert "Move from SkChunkAlloc to SkArenaAlloc for PathOps"
This reverts commit 38c60180241e335e368fdadbf7856aff114ff668.
Reason for revert: breaking ASAN run in TAP build
Original change's description:
> Move from SkChunkAlloc to SkArenaAlloc for PathOps
>
> Change-Id: Iab111a4ebcae4e896b1fdfe285def9ef0ae2ab6b
> Reviewed-on: https://skia-review.googlesource.com/7314
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
>
TBR=herb@google.com,caryclark@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I6364254571bb1617a9f45ed08f2af4a59f9d5841
Reviewed-on: https://skia-review.googlesource.com/9335
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'src/pathops/SkPathOpsTypes.cpp')
| -rw-r--r-- | src/pathops/SkPathOpsTypes.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pathops/SkPathOpsTypes.cpp b/src/pathops/SkPathOpsTypes.cpp index bddfd7e508..5f87076c24 100644 --- a/src/pathops/SkPathOpsTypes.cpp +++ b/src/pathops/SkPathOpsTypes.cpp @@ -4,7 +4,6 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "SkArenaAlloc.h" #include "SkFloatBits.h" #include "SkOpCoincidence.h" #include "SkPathOpsTypes.h" @@ -226,7 +225,7 @@ double SkDCubeRoot(double x) { } SkOpGlobalState::SkOpGlobalState(SkOpContourHead* head, - SkArenaAlloc* allocator + SkChunkAlloc* allocator SkDEBUGPARAMS(bool debugSkipAssert) SkDEBUGPARAMS(const char* testName)) : fAllocator(allocator) |