Use macros for new and delete in SkTemplates.h

include/core/SkTemplates.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTemplates_DEFINED
@@ skipping 83 matching lines @@
     SkAutoTCallIProc(T* obj): fObj(obj) {}
     ~SkAutoTCallIProc() { if (fObj) P(fObj); }
     T* detach() { T* obj = fObj; fObj = NULL; return obj; }
 private:
     T* fObj;
 };
 
 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; }
     T* operator->() const { SkASSERT(fObj); return fObj; }
 
     void reset(T* obj) {
         if (fObj != obj) {
-            delete fObj;
+            SkDELETE(fObj);
             fObj = obj;
         }
     }
 
     /**
      *  Delete the owned object, setting the internal pointer to NULL.
      */
     void free() {
-        delete fObj;
+        SkDELETE(fObj);
         fObj = NULL;
     }
 
     /**
      *  Transfer ownership of the object to the caller, setting the internal
      *  pointer to NULL. Note that this differs from get(), which also returns
      *  the pointer, but it does not transfer ownership.
      */
     T* detach() {
         T* obj = fObj;
@@ skipping 43 matching lines @@
     SkAutoTArray() {
         fArray = NULL;
         SkDEBUGCODE(fCount = 0;)
     }
     /** Allocate count number of T elements
      */
     explicit SkAutoTArray(int count) {
         SkASSERT(count >= 0);
         fArray = NULL;
         if (count) {
-            fArray = new T[count];
+            fArray = SkNEW_ARRAY(T, count);
         }
         SkDEBUGCODE(fCount = count;)
     }
 
     /** 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
      */
     T* get() const { return fArray; }
 
     /** Return the nth element in the array
      */
     T&  operator[](int index) const {
         SkASSERT((unsigned)index < (unsigned)fCount);
         return fArray[index];
     }
 
 private:
     T*  fArray;
     SkDEBUGCODE(int fCount;)
 };
 
 /** Wraps SkAutoTArray, with room for up to N elements preallocated
  */
 template <size_t N, typename T> class SkAutoSTArray : SkNoncopyable {
 public:
     /** Allocate count number of T elements
      */
     SkAutoSTArray(size_t count) {
         if (count > N) {
-            fArray = new T[count];
+            fArray = SkNEW_ARRAY(T, count);
         } else if (count) {
-            fArray = new (fStorage) T[count];

[bungeman-skia, 2013/05/25 03:22:07]

I think this is a bug. You can never be sure how much space an operator new[]
will take up, so you can't portably use placement operator new[]. See
http://stackoverflow.com/questions/8720425/array-placement-new-requires-unspe...
for one discussion, but basically 5.3.4.12 [expr.new] says operator new[] is
allowed to allocate a 'cookie' before the returned pointer so that operator
delete[] knows how many elements to delete. Basically, we need an assertion here
that after this assignment fArray == fStorage, but I bet this fails somewhere.
We're probably randomly overwriting bits of the stack depending on how we use
this class. See also
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#476 for the current
official position.

As such, I am against the change to add SkNEW_PLACEMENT_ARRAY (as there is no
safe way to use it) and in addition we need to fix this code to not do this.

+            fArray = SkNEW_PLACEMENT_ARRAY(fStorage, T, count);
         } else {
             fArray = NULL;
         }
         fCount = count;
     }
 
     ~SkAutoSTArray() {
         if (fCount > N) {
-            delete[] fArray;
+            SkDELETE_ARRAY(fArray);
         } else {
             T* start = fArray;
             T* iter = start + fCount;
             while (iter > start) {
                 (--iter)->~T();
             }
         }
     }
 
     /** Return the number of T elements in the array
@@ skipping 169 matching lines @@
     /**
      * Returns void* because this object does not initialize the
      * memory. Use placement new for types that require a cons.
      */
     void* get() { return fStorage.get(); }
 private:
     SkAlignedSStorage<sizeof(T)*N> fStorage;
 };
 
 #endif