diff --git a/build/all.gyp b/build/all.gyp index ff888adc715c71efb25bfc99e8647e4880221dd3..8de4152960e295f58e8f8609afbf2c8c01684e88 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -75,6 +75,7 @@ '../third_party/bsdiff/bsdiff.gyp:*', '../third_party/bspatch/bspatch.gyp:*', '../third_party/cld/cld.gyp:*', + '../third_party/tcmalloc/tcmalloc.gyp:*', '../tools/memory_watcher/memory_watcher.gyp:*', '../webkit/activex_shim/activex_shim.gyp:*', '../webkit/activex_shim_dll/activex_shim_dll.gyp:*', diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 478140c104e3f4f3f5ab99d5db86a42e28f284b1..43c22cfcb5156d2564c8debd6004340b7c0e6d21 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -226,8 +226,8 @@ void RegisterInvalidParamHandler() { _set_purecall_handler(PureCall); // Gather allocation failure. std::set_new_handler(&OnNoMemory); - // TODO: use _set_new_mode to enable the new handler for malloc() based - // failures. + // Also enable the new handler for malloc() based failures. + _set_new_mode(1); #endif } diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4c6cd567b405caf181e16fed6cf6c68c999d22be..236c80f4c0dd7b3c380ea06be8c35e3713d56376 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -4555,6 +4555,7 @@ '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', + '../third_party/tcmalloc/tcmalloc.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', '../webkit/webkit.gyp:*', @@ -4593,6 +4594,7 @@ '../net/net.gyp:net_resources', '../build/util/support/support.gyp:*', '../third_party/cld/cld.gyp:cld', + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', '../views/views.gyp:views', '../webkit/webkit.gyp:webkit_resources', '../gears/gears.gyp:gears',