aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkTypes.h
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-18 18:32:46 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-18 18:32:46 +0000
commit3ab4195445d8541b2950bd30ccaefe1e345afa25 (patch)
treef0aa215bcdea8fda0ffbf5cf1391185169925399 /include/core/SkTypes.h
parent86b49d2ef316989a5b0b5bd533eda43438d988e3 (diff)
remove unused optional param to SkAutoMalloc
git-svn-id: http://skia.googlecode.com/svn/trunk@2491 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkTypes.h')
-rw-r--r--include/core/SkTypes.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 968dbfc730..0f421eefde 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -408,9 +408,8 @@ private:
*/
class SkAutoMalloc : public SkNoncopyable {
public:
- explicit SkAutoMalloc(size_t size = 0,
- unsigned flags = SK_MALLOC_THROW | SK_MALLOC_TEMP) {
- fPtr = size ? sk_malloc_flags(size, flags) : NULL;
+ explicit SkAutoMalloc(size_t size = 0) {
+ fPtr = size ? sk_malloc_throw(size) : NULL;
fSize = size;
}
@@ -421,11 +420,10 @@ public:
/**
* Reallocates the block to a new size. The ptr may or may not change.
*/
- void* reset(size_t size,
- unsigned flags = (SK_MALLOC_THROW | SK_MALLOC_TEMP)) {
+ void* reset(size_t size) {
if (size != fSize) {
sk_free(fPtr);
- fPtr = size ? sk_malloc_flags(size, flags) : NULL;
+ fPtr = size ? sk_malloc_throw(size) : NULL;
fSize = size;
}
return fPtr;