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

Unified Diff: src/core/SkVarAlloc.h

Issue 1339093002: Have SkVarAlloc::alloc() use sk_malloc_throw. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: no, always throw Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkRecord.h ('k') | src/core/SkVarAlloc.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkVarAlloc.h
diff --git a/src/core/SkVarAlloc.h b/src/core/SkVarAlloc.h
index 0d0984285b614ad174b7dbceedddbe216db3ee48..3729bad1051b6ad518aef157edc43ceb4edabc3f 100644
--- a/src/core/SkVarAlloc.h
+++ b/src/core/SkVarAlloc.h
@@ -19,12 +19,12 @@ public:
~SkVarAlloc();
- // Returns contiguous bytes aligned at least for pointers. You may pass SK_MALLOC_THROW, etc.
- char* alloc(size_t bytes, unsigned sk_malloc_flags) {
+ // Returns contiguous bytes aligned at least for pointers.
+ char* alloc(size_t bytes) {
bytes = SkAlignPtr(bytes);
if (bytes > fRemaining) {
- this->makeSpace(bytes, sk_malloc_flags);
+ this->makeSpace(bytes);
}
SkASSERT(bytes <= fRemaining);
@@ -39,7 +39,7 @@ public:
size_t approxBytesAllocated() const { return fBytesAllocated; }
private:
- void makeSpace(size_t bytes, unsigned flags);
+ void makeSpace(size_t bytes);
size_t fBytesAllocated;
« no previous file with comments | « src/core/SkRecord.h ('k') | src/core/SkVarAlloc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698