Enhancements and a fix to templated containers.

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 210 matching lines @@
 
 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:
+    /** Initialize with no objects */
+    SkAutoSTArray() {
+        fArray = NULL;
+        fCount = 0;
+    }
+
     /** Allocate count number of T elements
      */
     SkAutoSTArray(size_t count) {
-        fCount = count;
-        if (count > N) {
-            fArray = (T*) sk_malloc_throw(count * sizeof(T));
-        } else if (count > 0) {
-            fArray = (T*) fStorage;
-        } else {
-            fArray = NULL;
-            return;
+        fArray = NULL;
+        fCount = 0;
+        this->reset(count);
+    }
+
+    ~SkAutoSTArray() {
+        this->reset(0);
+    }
+
+    /** Destroys previous objects in the array and default constructs count number of objects */
+    void reset(size_t count) {
+        T* start = fArray;
+        T* iter = start + fCount;
+        while (iter > start) {
+            (--iter)->~T();
         }
-        T* iter = fArray;
+
+        if (fCount != count) {
+            if (count > N) {
+                sk_free(fArray);
+            }
+
+            if (count > N) {
+                fArray = (T*) sk_malloc_throw(count * sizeof(T));
+            } else if (count > 0) {
+                fArray = (T*) fStorage;
+            } else {
+                fArray = NULL;
+                return;
+            }
+
+            fCount = count;
+        }
+
+        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) {
-            sk_free(fArray);
-        }
-    }
-
     /** Return the number of T elements in the array
      */
     size_t count() const { return fCount; }
 
     /** Return the array of T elements. Will be NULL if count == 0
      */
     T* get() const { return fArray; }
 
     /** Return the nth element in the array
      */
@@ skipping 161 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