Change growth function for SkWriter32

include/core/SkTDArray.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 SkTDArray_DEFINED
@@ skipping 133 matching lines @@
         } else {
             SkASSERT(fReserve == 0 && fCount == 0);
         }
     }
 
     void rewind() {
         // same as setCount(0)
         fCount = 0;
     }
 
     void setCount(int count) {

[reed1, 2014/02/07 15:37:49]

yikes -- what can this API mean if it doesn't change fCount all the time? Who
calls it? Do we really need both this and setCountExact? Can we add dox for
both, explaining the difference?

[iancottrell, 2014/02/07 16:54:15]

Done.

         if (count > fReserve) {
             this->growBy(count - fCount);
         } else {
             fCount = count;
         }
     }
 
+    void setCountExact(int count) {
+        if (count > fReserve) {
+            this->growTo(count);
+        }
+        fCount = count;
+    }
+
     void setReserve(int reserve) {
         if (reserve > fReserve) {
             SkASSERT(reserve > fCount);
             int count = fCount;
             this->growBy(reserve - fCount);
             fCount = count;
         }
     }
 
     T* prepend() {
@@ skipping 177 matching lines @@
     enum {
         kDebugArraySize = 16
     };
     typedef T ArrayT[kDebugArraySize];
     ArrayT* fData;
 #endif
     T*      fArray;
     int     fReserve;
     int     fCount;
 
+    void growTo(int size) {

[reed1, 2014/02/07 15:37:49]

/**
 * This resizes the storage to *exactly* size (should be count) elements,
growing or shrink the allocation as needed. It does not ASSERT anything about
the previous allocation size, or about fCount.
 */

[iancottrell, 2014/02/07 16:54:15]

Done.

+        fArray = (T*)sk_realloc_throw(fArray, size * sizeof(T));
+#ifdef SK_DEBUG
+        fData = (ArrayT*)fArray;
+#endif
+        fReserve = size;
+    }
+
     void growBy(int extra) {

[reed1, 2014/02/07 15:37:49]

/**
 * Increase the storage allocation such it can hold (fCount + extra) elements.
It never shrinks the allocation, and it may increase the allocation by more than
is strictly required, based on a private growth heuristic.
 */

[iancottrell, 2014/02/07 16:54:15]

Done.

         SkASSERT(extra);
 
         if (fCount + extra > fReserve) {
             int size = fCount + extra + 4;
-            size += size >> 2;
-
-            fArray = (T*)sk_realloc_throw(fArray, size * sizeof(T));
-#ifdef SK_DEBUG
-            fData = (ArrayT*)fArray;
-#endif
-            fReserve = size;
+            growTo(size + (size >> 2));
         }
         fCount += extra;
     }
 };
 
 #endif