Fix definition of CFAllocator (malloc_zone_t changed size between 10.5 and 10...

base/process_util_mac.mm

 // Copyright (c) 2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #include "base/process_util.h"
 
 #import <Cocoa/Cocoa.h>
 #include <crt_externs.h>
 #include <mach/mach.h>
@@ skipping 213 matching lines @@
 
 // OSX appears to use a different system to get its memory.
 bool ProcessMetrics::GetMemoryBytes(size_t* private_bytes,
                                     size_t* shared_bytes) {
   if (private_bytes)
     *private_bytes = 0;
   if (shared_bytes)
     *shared_bytes = 0;
   return true;
 }
-  
+
 void ProcessMetrics::GetCommittedKBytes(CommittedKBytes* usage) const {
 }
 
 bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
   size_t priv = GetWorkingSetSize();
   if (!priv)
     return false;
   ws_usage->priv = priv / 1024;
   ws_usage->shareable = 0;
   ws_usage->shared = 0;
@@ skipping 166 matching lines @@
 
 // === C++ operator new ===
 
 void oom_killer_new() {
   DebugUtil::BreakDebugger();
 }
 
 // === Core Foundation CFAllocators ===
 
 // This is the real structure of a CFAllocatorRef behind the scenes. See
-// http://opensource.apple.com/source/CF/CF-550/CFBase.c for details.
+// http://opensource.apple.com/source/CF/CF-476.19/CFBase.c (10.5.8) and
+// http://opensource.apple.com/source/CF/CF-550/CFBase.c (10.6) for details.
+struct ChromeCFRuntimeBase {
+  uintptr_t _cfisa;
+  uint8_t _cfinfo[4];
+#if __LP64__
+  uint32_t _rc;
+#endif
+};
+
 struct ChromeCFAllocator {
-  _malloc_zone_t fake_malloc_zone;
+  ChromeCFRuntimeBase cf_runtime_base;
+  size_t (*size)(struct _malloc_zone_t* zone, const void* ptr);
+  void* (*malloc)(struct _malloc_zone_t* zone, size_t size);
+  void* (*calloc)(struct _malloc_zone_t* zone, size_t num_items, size_t size);
+  void* (*valloc)(struct _malloc_zone_t* zone, size_t size);
+  void (*free)(struct _malloc_zone_t* zone, void* ptr);
+  void* (*realloc)(struct _malloc_zone_t* zone, void* ptr, size_t size);
+  void (*destroy)(struct _malloc_zone_t* zone);
+  const char* zone_name;
+  unsigned (*batch_malloc)(struct _malloc_zone_t* zone, size_t size,
+                           void** results, unsigned num_requested);
+  void (*batch_free)(struct _malloc_zone_t* zone, void** to_be_freed,
+                     unsigned num_to_be_freed);
+  struct malloc_introspection_t* introspect;
+  void* reserved5;
+
   void* allocator;
   CFAllocatorContext context;
 };
 typedef ChromeCFAllocator* ChromeCFAllocatorRef;
 
 CFAllocatorAllocateCallBack g_old_cfallocator_system_default;
 CFAllocatorAllocateCallBack g_old_cfallocator_malloc;
 CFAllocatorAllocateCallBack g_old_cfallocator_malloc_zone;
 
 void* oom_killer_cfallocator_system_default(CFIndex alloc_size,
@@ skipping 141 matching lines @@
                                             @selector(allocWithZone:));
   g_old_allocWithZone = reinterpret_cast<allocWithZone_t>(
       method_getImplementation(orig_method));
   CHECK(g_old_allocWithZone)
       << "Failed to get allocWithZone allocation function.";
   method_setImplementation(orig_method,
                            reinterpret_cast<IMP>(oom_killer_allocWithZone));
 }
 
 }  // namespace base