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