diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-26 19:56:51 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-26 19:56:51 +0000 |
| commit | 939ca7ce860c5e80a4fdccc0dba5f7bfa29fef22 (patch) | |
| tree | 58e1f8a0928368c9e97ef402f7c8a65dd69447f8 /src/gpu/GrAllocPool.cpp | |
| parent | baed71fbfeee030184af74eb7e8622e99952bbf8 (diff) | |
move GrMalloc, GrFree, Gr_bzero to their sk equivalents
BUG=
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/23566022
git-svn-id: http://skia.googlecode.com/svn/trunk@11486 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrAllocPool.cpp')
| -rw-r--r-- | src/gpu/GrAllocPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrAllocPool.cpp b/src/gpu/GrAllocPool.cpp index 127511f164..d7b553176d 100644 --- a/src/gpu/GrAllocPool.cpp +++ b/src/gpu/GrAllocPool.cpp @@ -20,7 +20,7 @@ struct GrAllocPool::Block { static Block* Create(size_t size, Block* next) { SkASSERT(size >= GrAllocPool_MIN_BLOCK_SIZE); - Block* block = (Block*)GrMalloc(sizeof(Block) + size); + Block* block = (Block*)sk_malloc_throw(sizeof(Block) + size); block->fNext = next; block->fPtr = (char*)block + sizeof(Block); block->fBytesFree = size; @@ -69,7 +69,7 @@ void GrAllocPool::reset() { Block* block = fBlock; while (block) { Block* next = block->fNext; - GrFree(block); + sk_free(block); block = next; } fBlock = NULL; @@ -94,7 +94,7 @@ void GrAllocPool::release(size_t bytes) { bytes = fBlock->release(bytes); if (fBlock->empty()) { Block* next = fBlock->fNext; - GrFree(fBlock); + sk_free(fBlock); fBlock = next; SkDEBUGCODE(fBlocksAllocated -= 1;) } |