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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « src/core/SkRecord.h ('k') | src/core/SkVarAlloc.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 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkVarAlloc_DEFINED 8 #ifndef SkVarAlloc_DEFINED
9 #define SkVarAlloc_DEFINED 9 #define SkVarAlloc_DEFINED
10 10
11 #include "SkTypes.h" 11 #include "SkTypes.h"
12 12
13 class SkVarAlloc : SkNoncopyable { 13 class SkVarAlloc : SkNoncopyable {
14 public: 14 public:
15 // Smallest block we'll allocate is 2**N bytes. 15 // Smallest block we'll allocate is 2**N bytes.
16 explicit SkVarAlloc(size_t minLgSize); 16 explicit SkVarAlloc(size_t minLgSize);
17 // Same as above, but first uses up to len bytes from storage. 17 // Same as above, but first uses up to len bytes from storage.
18 SkVarAlloc(size_t minLgSize, char* storage, size_t len); 18 SkVarAlloc(size_t minLgSize, char* storage, size_t len);
19 19
20 ~SkVarAlloc(); 20 ~SkVarAlloc();
21 21
22 // Returns contiguous bytes aligned at least for pointers. You may pass SK_ MALLOC_THROW, etc. 22 // Returns contiguous bytes aligned at least for pointers.
23 char* alloc(size_t bytes, unsigned sk_malloc_flags) { 23 char* alloc(size_t bytes) {
24 bytes = SkAlignPtr(bytes); 24 bytes = SkAlignPtr(bytes);
25 25
26 if (bytes > fRemaining) { 26 if (bytes > fRemaining) {
27 this->makeSpace(bytes, sk_malloc_flags); 27 this->makeSpace(bytes);
28 } 28 }
29 SkASSERT(bytes <= fRemaining); 29 SkASSERT(bytes <= fRemaining);
30 30
31 char* ptr = fByte; 31 char* ptr = fByte;
32 fByte += bytes; 32 fByte += bytes;
33 fRemaining = SkToU32(fRemaining - bytes); 33 fRemaining = SkToU32(fRemaining - bytes);
34 return ptr; 34 return ptr;
35 } 35 }
36 36
37 // Returns our best estimate of the number of bytes we've allocated. 37 // Returns our best estimate of the number of bytes we've allocated.
38 // (We may not track this precisely to save space.) 38 // (We may not track this precisely to save space.)
39 size_t approxBytesAllocated() const { return fBytesAllocated; } 39 size_t approxBytesAllocated() const { return fBytesAllocated; }
40 40
41 private: 41 private:
42 void makeSpace(size_t bytes, unsigned flags); 42 void makeSpace(size_t bytes);
43 43
44 size_t fBytesAllocated; 44 size_t fBytesAllocated;
45 45
46 char* fByte; 46 char* fByte;
47 unsigned fRemaining; 47 unsigned fRemaining;
48 unsigned fLgSize; 48 unsigned fLgSize;
49 49
50 struct Block; 50 struct Block;
51 Block* fBlock; 51 Block* fBlock;
52 }; 52 };
53 static_assert(sizeof(SkVarAlloc) <= 32, "SkVarAllocSize"); 53 static_assert(sizeof(SkVarAlloc) <= 32, "SkVarAllocSize");
54 54
55 #endif//SkVarAlloc_DEFINED 55 #endif//SkVarAlloc_DEFINED
OLDNEW
« 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