From c0a4c4f969464ec9854d726836a430262351d63d Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Tue, 7 Mar 2017 11:14:59 +0000 Subject: 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 > Commit-Queue: Herb Derby > 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 Commit-Queue: Derek Sollenberger --- src/pathops/SkPathOpsTypes.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/pathops/SkPathOpsTypes.cpp') 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) -- cgit v1.2.3