| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 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 | 9 |
| 10 #ifndef SkTDArray_DEFINED | 10 #ifndef SkTDArray_DEFINED |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 void swap(SkTDArray<T>& other) { | 64 void swap(SkTDArray<T>& other) { |
| 65 SkTSwap(fArray, other.fArray); | 65 SkTSwap(fArray, other.fArray); |
| 66 SkTSwap(fReserve, other.fReserve); | 66 SkTSwap(fReserve, other.fReserve); |
| 67 SkTSwap(fCount, other.fCount); | 67 SkTSwap(fCount, other.fCount); |
| 68 } | 68 } |
| 69 | 69 |
| 70 /** Return a ptr to the array of data, to be freed with sk_free. This also | 70 /** Return a ptr to the array of data, to be freed with sk_free. This also |
| 71 resets the SkTDArray to be empty. | 71 resets the SkTDArray to be empty. |
| 72 */ | 72 */ |
| 73 T* detach() { | 73 T* release() { |
| 74 T* array = fArray; | 74 T* array = fArray; |
| 75 fArray = NULL; | 75 fArray = NULL; |
| 76 fReserve = fCount = 0; | 76 fReserve = fCount = 0; |
| 77 return array; | 77 return array; |
| 78 } | 78 } |
| 79 | 79 |
| 80 bool isEmpty() const { return fCount == 0; } | 80 bool isEmpty() const { return fCount == 0; } |
| 81 | 81 |
| 82 /** | 82 /** |
| 83 * Return the number of elements in the array | 83 * Return the number of elements in the array |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 */ | 355 */ |
| 356 void resizeStorageToAtLeast(int count) { | 356 void resizeStorageToAtLeast(int count) { |
| 357 SkASSERT(count > fReserve); | 357 SkASSERT(count > fReserve); |
| 358 fReserve = count + 4; | 358 fReserve = count + 4; |
| 359 fReserve += fReserve / 4; | 359 fReserve += fReserve / 4; |
| 360 fArray = (T*)sk_realloc_throw(fArray, fReserve * sizeof(T)); | 360 fArray = (T*)sk_realloc_throw(fArray, fReserve * sizeof(T)); |
| 361 } | 361 } |
| 362 }; | 362 }; |
| 363 | 363 |
| 364 #endif | 364 #endif |
| OLD | NEW |