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 /tests/PathOpsAngleIdeas.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 'tests/PathOpsAngleIdeas.cpp')
| -rw-r--r-- | tests/PathOpsAngleIdeas.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/PathOpsAngleIdeas.cpp b/tests/PathOpsAngleIdeas.cpp index 003242fbc0..a408a3c3b1 100644 --- a/tests/PathOpsAngleIdeas.cpp +++ b/tests/PathOpsAngleIdeas.cpp @@ -419,7 +419,7 @@ static void makeSegment(SkOpContour* contour, const SkDQuad& quad, SkPoint short } static void testQuadAngles(skiatest::Reporter* reporter, const SkDQuad& quad1, const SkDQuad& quad2, - int testNo, SkArenaAlloc* allocator) { + int testNo, SkChunkAlloc* allocator) { SkPoint shortQuads[2][3]; SkOpContourHead contour; @@ -558,8 +558,7 @@ static void testQuadAngles(skiatest::Reporter* reporter, const SkDQuad& quad1, c } DEF_TEST(PathOpsAngleOverlapHullsOne, reporter) { - char storage[4096]; - SkArenaAlloc allocator(storage); + SkChunkAlloc allocator(4096); // gPathOpsAngleIdeasVerbose = true; const QuadPts quads[] = { {{{939.4808349609375, 914.355224609375}, {-357.7921142578125, 590.842529296875}, {736.8936767578125, -350.717529296875}}}, @@ -574,8 +573,7 @@ DEF_TEST(PathOpsAngleOverlapHullsOne, reporter) { } DEF_TEST(PathOpsAngleOverlapHulls, reporter) { - char storage[4096]; - SkArenaAlloc allocator(storage); + SkChunkAlloc allocator(4096); if (!gPathOpsAngleIdeasVerbose) { // takes a while to run -- so exclude it by default return; } |