From c3cc5fa6de0a8237d9241dbf3e6c0786a9040069 Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Tue, 7 Mar 2017 11:11:47 -0500 Subject: Move from SkChunkAlloc to SkArenaAlloc for PathOps Attempt two. Remove ~SkOpContour because it is handled by the SkArenaAlloc. Change-Id: Id3049db97aebcc1009d403a031f2fac219f58f2f Reviewed-on: https://skia-review.googlesource.com/9381 Reviewed-by: Derek Sollenberger Commit-Queue: Herb Derby --- tests/PathOpsAngleTest.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/PathOpsAngleTest.cpp') diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp index d5285c8fbc..4226a77a79 100644 --- a/tests/PathOpsAngleTest.cpp +++ b/tests/PathOpsAngleTest.cpp @@ -239,7 +239,8 @@ static CircleData circleDataSet[] = { static const int circleDataSetSize = (int) SK_ARRAY_COUNT(circleDataSet); DEF_TEST(PathOpsAngleCircle, reporter) { - SkChunkAlloc allocator(4096); + char storage[4096]; + SkArenaAlloc allocator(storage); SkOpContourHead contour; SkOpGlobalState state(&contour, &allocator SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr)); contour.init(&state, false, false); @@ -431,7 +432,8 @@ struct FourPoints { }; DEF_TEST(PathOpsAngleAfter, reporter) { - SkChunkAlloc allocator(4096); + char storage[4096]; + SkArenaAlloc allocator(storage); SkOpContourHead contour; SkOpGlobalState state(&contour, &allocator SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr)); contour.init(&state, false, false); @@ -503,7 +505,8 @@ void SkOpSegment::debugAddAngle(double startT, double endT) { } DEF_TEST(PathOpsAngleAllOnOneSide, reporter) { - SkChunkAlloc allocator(4096); + char storage[4096]; + SkArenaAlloc allocator(storage); SkOpContourHead contour; SkOpGlobalState state(&contour, &allocator SkDEBUGPARAMS(false) SkDEBUGPARAMS(nullptr)); contour.init(&state, false, false); -- cgit v1.2.3