Get rid of fastMallocGoodSize() and replace it with something generic.

Source/wtf/Vector.h

 /*
  *  Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 10 matching lines @@
 #ifndef WTF_Vector_h
 #define WTF_Vector_h
 
 #include "wtf/Alignment.h"
 #include "wtf/FastAllocBase.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/NotFound.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/UnusedParam.h"
 #include "wtf/VectorTraits.h"
-#include <limits>
+#include "wtf/WTF.h"
 #include <utility>
 #include <string.h>
 
 namespace WTF {
 
 #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 static const size_t kInitialVectorSize = 1;
 #else
 #ifndef WTF_VECTOR_INITIAL_SIZE
 #define WTF_VECTOR_INITIAL_SIZE 16
@@ skipping 205 matching lines @@
         static bool compare(const T* a, const T* b, size_t size)
         {
             return VectorComparer<VectorTraits<T>::canCompareWithMemcmp, T>::compare(a, b, size);
         }
     };
 
     template<typename T>
     class VectorBufferBase {
         WTF_MAKE_NONCOPYABLE(VectorBufferBase);
     public:
+        size_t roundSize(size_t size)
+        {
+            return (size + 7) & ~7;
+        }
+
         void allocateBuffer(size_t newCapacity)
         {
             ASSERT(newCapacity);
-            // Using "unsigned" is not a limitation because Chromium's max malloc() is 2GB even on 64-bit.
-            RELEASE_ASSERT(newCapacity <= std::numeric_limits<unsigned>::max() / sizeof(T));
-            size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+            RELEASE_ASSERT(newCapacity <= WTF::QuantizedAllocation::kMaxUnquantizedAllocation / sizeof(T));

[abarth-chromium, 2013/09/07 05:08:24]

WTF::  <-- no need for WTF prefix inside WTF.

+            size_t origSizeToAllocate = newCapacity * sizeof(T);

[abarth-chromium, 2013/09/07 05:08:24]

origSizeToAllocate ---> originalSizeToAllocate

Please use complete words in variable names.

+            size_t sizeToAllocate = WTF::QuantizedAllocation::quantizedSize(origSizeToAllocate);
             m_capacity = sizeToAllocate / sizeof(T);
             m_buffer = static_cast<T*>(fastMalloc(sizeToAllocate));
         }
 
         bool shouldReallocateBuffer(size_t newCapacity) const
         {
             return VectorTraits<T>::canMoveWithMemcpy && m_capacity && newCapacity;
         }
 
         void reallocateBuffer(size_t newCapacity)
         {
             ASSERT(shouldReallocateBuffer(newCapacity));
-            // Using "unsigned" is not a limitation because Chromium's max malloc() is 2GB even on 64-bit.
-            RELEASE_ASSERT(newCapacity <= std::numeric_limits<unsigned>::max() / sizeof(T));
-            size_t sizeToAllocate = fastMallocGoodSize(newCapacity * sizeof(T));
+            RELEASE_ASSERT(newCapacity <= WTF::QuantizedAllocation::kMaxUnquantizedAllocation / sizeof(T));
+            size_t origSizeToAllocate = newCapacity * sizeof(T);
+            size_t sizeToAllocate = WTF::QuantizedAllocation::quantizedSize(origSizeToAllocate);
             m_capacity = sizeToAllocate / sizeof(T);
             m_buffer = static_cast<T*>(fastRealloc(m_buffer, sizeToAllocate));
         }
 
         void deallocateBuffer(T* bufferToDeallocate)
         {
             if (!bufferToDeallocate)
                 return;
 
             if (m_buffer == bufferToDeallocate) {
@@ skipping 776 matching lines @@
     inline bool operator!=(const Vector<T, inlineCapacity>& a, const Vector<T, inlineCapacity>& b)
     {
         return !(a == b);
     }
 
 } // namespace WTF
 
 using WTF::Vector;
 
 #endif // WTF_Vector_h