Use macros for new and delete in SkTemplates.h
Remove use of new placement array.
R=bungeman@google.com, reed@google.com
Review URL: https://codereview.chromium.org/15739013
git-svn-id: http://skia.googlecode.com/svn/trunk@9329 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkTemplates.h b/include/core/SkTemplates.h
index 5eb7885..ce76dbf 100644
--- a/include/core/SkTemplates.h
+++ b/include/core/SkTemplates.h
@@ -101,7 +101,7 @@
template <typename T> class SkAutoTDelete : SkNoncopyable {
public:
SkAutoTDelete(T* obj = NULL) : fObj(obj) {}
- ~SkAutoTDelete() { delete fObj; }
+ ~SkAutoTDelete() { SkDELETE(fObj); }
T* get() const { return fObj; }
T& operator*() const { SkASSERT(fObj); return *fObj; }
@@ -109,7 +109,7 @@
void reset(T* obj) {
if (fObj != obj) {
- delete fObj;
+ SkDELETE(fObj);
fObj = obj;
}
}
@@ -118,7 +118,7 @@
* Delete the owned object, setting the internal pointer to NULL.
*/
void free() {
- delete fObj;
+ SkDELETE(fObj);
fObj = NULL;
}
@@ -182,7 +182,7 @@
SkASSERT(count >= 0);
fArray = NULL;
if (count) {
- fArray = new T[count];
+ fArray = SkNEW_ARRAY(T, count);
}
SkDEBUGCODE(fCount = count;)
}
@@ -190,17 +190,17 @@
/** Reallocates given a new count. Reallocation occurs even if new count equals old count.
*/
void reset(int count) {
- delete[] fArray;
+ SkDELETE_ARRAY(fArray);
SkASSERT(count >= 0);
fArray = NULL;
if (count) {
- fArray = new T[count];
+ fArray = SkNEW_ARRAY(T, count);
}
SkDEBUGCODE(fCount = count;)
}
~SkAutoTArray() {
- delete[] fArray;
+ SkDELETE_ARRAY(fArray);
}
/** Return the array of T elements. Will be NULL if count == 0
@@ -226,25 +226,30 @@
/** Allocate count number of T elements
*/
SkAutoSTArray(size_t count) {
+ fCount = count;
if (count > N) {
- fArray = new T[count];
- } else if (count) {
- fArray = new (fStorage) T[count];
+ fArray = (T*) sk_malloc_throw(count * sizeof(T));
+ } else if (count > 0) {
+ fArray = (T*) fStorage;
} else {
fArray = NULL;
+ return;
}
- fCount = count;
+ T* iter = fArray;
+ T* stop = fArray + count;
+ while (iter < stop) {
+ SkNEW_PLACEMENT(iter++, T);
+ }
}
~SkAutoSTArray() {
+ T* start = fArray;
+ T* iter = start + fCount;
+ while (iter > start) {
+ (--iter)->~T();
+ }
if (fCount > N) {
- delete[] fArray;
- } else {
- T* start = fArray;
- T* iter = start + fCount;
- while (iter > start) {
- (--iter)->~T();
- }
+ sk_free(fArray);
}
}