commit 939ca7ce860c5e80a4fdccc0dba5f7bfa29fef22
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 26 19:56:51 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 26 19:56:51 2013 +0000
tree 58e1f8a0928368c9e97ef402f7c8a65dd69447f8
parent baed71fbfeee030184af74eb7e8622e99952bbf8

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

src/gpu/GrMemoryPool.cpp

diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp
index 83b02bd..deb7d1a 100644
--- a/src/gpu/GrMemoryPool.cpp
+++ b/src/gpu/GrMemoryPool.cpp
@@ -104,7 +104,7 @@
 
 GrMemoryPool::BlockHeader* GrMemoryPool::CreateBlock(size_t size) {
     BlockHeader* block =
-        reinterpret_cast<BlockHeader*>(GrMalloc(size + kHeaderSize));
+        reinterpret_cast<BlockHeader*>(sk_malloc_throw(size + kHeaderSize));
     // we assume malloc gives us aligned memory
     SkASSERT(!(reinterpret_cast<intptr_t>(block) % kAlignment));
     block->fLiveCount = 0;
@@ -115,7 +115,7 @@
 }
 
 void GrMemoryPool::DeleteBlock(BlockHeader* block) {
-    GrFree(block);
+    sk_free(block);
 }
 
 void GrMemoryPool::validate() {