Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: src/ports/SkMemory_mozalloc.cpp

Issue 1449093002: use malloc/calloc/free instead of moz_malloc/moz_calloc/moz_free in ports/SkMemory_mozalloc.cpp (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: use malloc/calloc/free instead of moz_malloc/moz_calloc/moz_free in ports/SkMemory_mozalloc.cpp Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkMemory_mozalloc.cpp
diff --git a/src/ports/SkMemory_mozalloc.cpp b/src/ports/SkMemory_mozalloc.cpp
index 4ca931267152706632740696b5b9092b877820d3..f0700858938161ce62d328a2280238966993084c 100644
--- 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) {
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698