Revert 157524 "Get rid of fastMallocGoodSize() and replace it wi..."

trunk/Source/wtf/FastMalloc.cpp

 // Copyright (c) 2005, 2007, Google Inc.
 // All rights reserved.
 // Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 195 matching lines @@
 #if FORCE_SYSTEM_MALLOC
 
 #if OS(MACOSX)
 #include <malloc/malloc.h>
 #elif OS(WIN)
 #include <malloc.h>
 #endif
 
 namespace WTF {
 
+size_t fastMallocGoodSize(size_t bytes)
+{
+#if OS(MACOSX)
+    return malloc_good_size(bytes);
+#else
+    return bytes;
+#endif
+}
+
 void* fastMalloc(size_t n)
 {
     ASSERT(!isForbidden());
 
     void* result = malloc(n);
     ASSERT(result);  // We expect tcmalloc underneath, which would crash instead of getting here.
 
     return result;
 }
 
@@ skipping 2224 matching lines @@
 } PageHeapUnion;
 
 static inline TCMalloc_PageHeap* getPageHeap()
 {
     PageHeapUnion u = { &pageheap_memory[0] };
     return u.m_pageHeap;
 }
 
 #define pageheap getPageHeap()
 
+size_t fastMallocGoodSize(size_t bytes)
+{
+    if (!phinited)
+        TCMalloc_ThreadCache::InitModule();
+    return AllocationSize(bytes);
+}
+
 #if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
 
 #if HAVE(DISPATCH_H) || OS(WIN)
 
 void TCMalloc_PageHeap::periodicScavenge()
 {
     SpinLockHolder h(&pageheap_lock);
     pageheap->scavenge();
 
     if (shouldScavenge()) {
@@ skipping 1405 matching lines @@
 void FastMallocZone::init()
 {
     static FastMallocZone zone(pageheap, &thread_heaps, static_cast<TCMalloc_Central_FreeListPadded*>(central_cache), &span_allocator, &threadheap_allocator);
 }
 
 #endif // OS(MACOSX)
 
 } // namespace WTF
 
 #endif // FORCE_SYSTEM_MALLOC