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

Side by Side Diff: src/ports/SkMemory_mozalloc.cpp

Issue 24251008: Add sk_calloc. Remove SkMemory_stdlib, which seems unused. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: use sk_out_of_memory Created 7 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/ports/SkMemory_malloc.cpp ('k') | tests/MemoryTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * Copyright 2012 Mozilla Foundation 3 * Copyright 2012 Mozilla Foundation
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "SkTypes.h" 9 #include "SkTypes.h"
10 10
(...skipping 19 matching lines...) Expand all
30 return moz_xrealloc(addr, size); 30 return moz_xrealloc(addr, size);
31 } 31 }
32 32
33 void sk_free(void* p) { 33 void sk_free(void* p) {
34 moz_free(p); 34 moz_free(p);
35 } 35 }
36 36
37 void* sk_malloc_flags(size_t size, unsigned flags) { 37 void* sk_malloc_flags(size_t size, unsigned flags) {
38 return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : moz_malloc(size); 38 return (flags & SK_MALLOC_THROW) ? moz_xmalloc(size) : moz_malloc(size);
39 } 39 }
40
41 void* sk_calloc(size_t size) {
42 return moz_calloc(size, 1);
43 }
44
45 void* sk_calloc_throw(size_t size) {
46 return moz_xcalloc(size, 1);
47 }
OLDNEW
« no previous file with comments | « src/ports/SkMemory_malloc.cpp ('k') | tests/MemoryTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698