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

Side by Side Diff: include/core/SkTDArray.h

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT 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 | « include/core/SkTArray.h ('k') | include/core/SkTypeface.h » ('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 /* 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 void push(const T& elem) { *this->append() = elem; } 267 void push(const T& elem) { *this->append() = elem; }
268 const T& top() const { return (*this)[fCount - 1]; } 268 const T& top() const { return (*this)[fCount - 1]; }
269 T& top() { return (*this)[fCount - 1]; } 269 T& top() { return (*this)[fCount - 1]; }
270 void pop(T* elem) { SkASSERT(fCount > 0); if (elem) *elem = (*this)[fCou nt - 1]; --fCount; } 270 void pop(T* elem) { SkASSERT(fCount > 0); if (elem) *elem = (*this)[fCou nt - 1]; --fCount; }
271 void pop() { SkASSERT(fCount > 0); --fCount; } 271 void pop() { SkASSERT(fCount > 0); --fCount; }
272 272
273 void deleteAll() { 273 void deleteAll() {
274 T* iter = fArray; 274 T* iter = fArray;
275 T* stop = fArray + fCount; 275 T* stop = fArray + fCount;
276 while (iter < stop) { 276 while (iter < stop) {
277 SkDELETE (*iter); 277 delete *iter;
278 iter += 1; 278 iter += 1;
279 } 279 }
280 this->reset(); 280 this->reset();
281 } 281 }
282 282
283 void freeAll() { 283 void freeAll() {
284 T* iter = fArray; 284 T* iter = fArray;
285 T* stop = fArray + fCount; 285 T* stop = fArray + fCount;
286 while (iter < stop) { 286 while (iter < stop) {
287 sk_free(*iter); 287 sk_free(*iter);
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « include/core/SkTArray.h ('k') | include/core/SkTypeface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698