| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google, Inc | 2 * Copyright 2014 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 SkSmallAllocator_DEFINED | 8 #ifndef SkSmallAllocator_DEFINED |
| 9 #define SkSmallAllocator_DEFINED | 9 #define SkSmallAllocator_DEFINED |
| 10 | 10 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 template<typename T, typename A1, typename A2, typename A3> | 89 template<typename T, typename A1, typename A2, typename A3> |
| 90 T* createT(const A1& a1, const A2& a2, const A3& a3) { | 90 T* createT(const A1& a1, const A2& a2, const A3& a3) { |
| 91 void* buf = this->reserveT<T>(); | 91 void* buf = this->reserveT<T>(); |
| 92 if (NULL == buf) { | 92 if (NULL == buf) { |
| 93 return NULL; | 93 return NULL; |
| 94 } | 94 } |
| 95 SkNEW_PLACEMENT_ARGS(buf, T, (a1, a2, a3)); | 95 SkNEW_PLACEMENT_ARGS(buf, T, (a1, a2, a3)); |
| 96 return static_cast<T*>(buf); | 96 return static_cast<T*>(buf); |
| 97 } | 97 } |
| 98 | 98 |
| 99 template<typename T, typename A1, typename A2, typename A3, typename A4> |
| 100 T* createT(const A1& a1, const A2& a2, const A3& a3, const A4& a4) { |
| 101 void* buf = this->reserveT<T>(); |
| 102 if (NULL == buf) { |
| 103 return NULL; |
| 104 } |
| 105 SkNEW_PLACEMENT_ARGS(buf, T, (a1, a2, a3, a4)); |
| 106 return static_cast<T*>(buf); |
| 107 } |
| 108 |
| 99 /* | 109 /* |
| 100 * Reserve a specified amount of space (must be enough space for one T). | 110 * Reserve a specified amount of space (must be enough space for one T). |
| 101 * The space will be in fStorage if there is room, or on the heap otherwise
. | 111 * The space will be in fStorage if there is room, or on the heap otherwise
. |
| 102 * Either way, this class will call ~T() in its destructor and free the hea
p | 112 * Either way, this class will call ~T() in its destructor and free the hea
p |
| 103 * allocation if necessary. | 113 * allocation if necessary. |
| 104 * Unlike createT(), this method will not call the constructor of T. | 114 * Unlike createT(), this method will not call the constructor of T. |
| 105 */ | 115 */ |
| 106 template<typename T> void* reserveT(size_t storageRequired = sizeof(T)) { | 116 template<typename T> void* reserveT(size_t storageRequired = sizeof(T)) { |
| 107 SkASSERT(fNumObjects < kMaxObjects); | 117 SkASSERT(fNumObjects < kMaxObjects); |
| 108 SkASSERT(storageRequired >= sizeof(T)); | 118 SkASSERT(storageRequired >= sizeof(T)); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 | 167 |
| 158 // Number of bytes used so far. | 168 // Number of bytes used so far. |
| 159 size_t fStorageUsed; | 169 size_t fStorageUsed; |
| 160 // Pad the storage size to be 4-byte aligned. | 170 // Pad the storage size to be 4-byte aligned. |
| 161 uint32_t fStorage[SkAlign4(kTotalBytes) >> 2]; | 171 uint32_t fStorage[SkAlign4(kTotalBytes) >> 2]; |
| 162 uint32_t fNumObjects; | 172 uint32_t fNumObjects; |
| 163 Rec fRecs[kMaxObjects]; | 173 Rec fRecs[kMaxObjects]; |
| 164 }; | 174 }; |
| 165 | 175 |
| 166 #endif // SkSmallAllocator_DEFINED | 176 #endif // SkSmallAllocator_DEFINED |
| OLD | NEW |