Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: content/app/content_main_runner.cc

Issue 2658723007: Hook up allocator shim on mac. (Closed)
Patch Set: Rebase. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/app/framework.order ('K') | « chrome/app/framework.order ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index b236b99c4c315a77188fa8486091b03960813a66..f9ea2f6d1599772f25ae5caf105a41f7cad6addd 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -15,6 +15,7 @@
#include "base/allocator/allocator_check.h"
#include "base/allocator/allocator_extension.h"
+#include "base/allocator/features.h"
#include "base/at_exit.h"
#include "base/base_switches.h"
#include "base/command_line.h"
@@ -87,6 +88,7 @@
#include "ui/base/win/atl_module.h"
#include "ui/display/win/dpi.h"
#elif defined(OS_MACOSX)
+#include "base/allocator/allocator_shim.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/power_monitor/power_monitor_device_source.h"
#include "content/app/mac/mac_init.h"
@@ -472,6 +474,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
env_mode_ = params.env_mode;
#endif
+#if defined(OS_MACOSX) && BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
Primiano Tucci (use gerrit) 2017/01/28 05:10:03 I would probably leave this for later, once we hav
erikchen 2017/01/31 02:21:22 shrug, okay, done.
+ base::allocator::InitializeAllocatorShim();
+#endif
base::EnableTerminationOnOutOfMemory();
#if defined(OS_WIN)
base::win::RegisterInvalidParamHandler();
« chrome/app/framework.order ('K') | « chrome/app/framework.order ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698