Index: base/allocator/allocator_shim_default_dispatch_to_glibc.cc |
diff --git a/base/allocator/allocator_shim_default_dispatch_to_glibc.cc b/base/allocator/allocator_shim_default_dispatch_to_glibc.cc |
index 7415ec60c01b69ea5cc4645b5f44259a5d56e687..8574da3eb3d011f08625f1e11cbeb1b0b5729965 100644 |
--- a/base/allocator/allocator_shim_default_dispatch_to_glibc.cc |
+++ b/base/allocator/allocator_shim_default_dispatch_to_glibc.cc |
@@ -22,27 +22,38 @@ namespace { |
using base::allocator::AllocatorDispatch; |
-void* GlibcMalloc(const AllocatorDispatch*, size_t size) { |
+void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { |
return __libc_malloc(size); |
} |
-void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size) { |
+void* GlibcCalloc(const AllocatorDispatch*, |
+ size_t n, |
+ size_t size, |
+ void* context) { |
return __libc_calloc(n, size); |
} |
-void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size) { |
+void* GlibcRealloc(const AllocatorDispatch*, |
+ void* address, |
+ size_t size, |
+ void* context) { |
return __libc_realloc(address, size); |
} |
-void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size) { |
+void* GlibcMemalign(const AllocatorDispatch*, |
+ size_t alignment, |
+ size_t size, |
+ void* context) { |
return __libc_memalign(alignment, size); |
} |
-void GlibcFree(const AllocatorDispatch*, void* address) { |
+void GlibcFree(const AllocatorDispatch*, void* address, void* context) { |
__libc_free(address); |
} |
-size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) { |
+size_t GlibcGetSizeEstimate(const AllocatorDispatch*, |
+ void* address, |
+ void* context) { |
// TODO(siggi, primiano): malloc_usable_size may need redirection in the |
// presence of interposing shims that divert allocations. |
return malloc_usable_size(address); |