use malloc/calloc/free instead of moz_malloc/moz_calloc/moz_free in ports/SkMemory_mo...

BUG=skia:4560

Review URL: https://codereview.chromium.org/1449093002

diff --git a/AUTHORS b/AUTHORS
index 47f675b..4b3c09e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,6 +23,7 @@ Intel <*@intel.com>
 Ion Rosca <rosca@adobe.com>
 Jacek Caban <cjacek@gmail.com>
 Jeff Muizelaar <jmuizelaar@mozilla.com>
+Lee Salzman <lsalzman@mozilla.com>
 MIPS <*@imgtec.com>
 NVIDIA <*@nvidia.com>
 Opera Software ASA <*@opera.com>

diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp
index 4ca9312..f070085 100644 (file)
--- a/src/ports/SkMemory_mozalloc.cpp
+++ b/src/ports/SkMemory_mozalloc.cpp
@@ -31,15 +31,15 @@ void* sk_realloc_throw(void* addr, size_t size) {
 }
 
 void sk_free(void* p) {
-    moz_free(p);
+    free(p);
 }
 
 void* sk_malloc_flags(size_t size, unsigned flags) {
-    return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : moz_malloc(size);
+    return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : malloc(size);
 }
 
 void* sk_calloc(size_t size) {
-    return moz_calloc(size, 1);
+    return calloc(size, 1);
 }
 
 void* sk_calloc_throw(size_t size) {