diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 09:59:53 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 09:59:53 +0000 |
| commit | 7ccd609706e11a32aed9f7fbf4bf31c1b89df99c (patch) | |
| tree | e7e0cae6b3dd4f2aadf0d7823d211cc9e035a60f /content/renderer/devtools | |
| parent | 3ab17a98916459f0725c41a90c3fc0dd4f4f77bc (diff) | |
| download | chromium_src-7ccd609706e11a32aed9f7fbf4bf31c1b89df99c.zip chromium_src-7ccd609706e11a32aed9f7fbf4bf31c1b89df99c.tar.gz chromium_src-7ccd609706e11a32aed9f7fbf4bf31c1b89df99c.tar.bz2 | |
Linux: add option to use system tcmalloc (off by default)
This changes things only for Linux distros, Google Chrome
will continue to use bundled tcmalloc.
TBR=darin
BUG=174634
Review URL: https://codereview.chromium.org/12224030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/devtools')
| -rw-r--r-- | content/renderer/devtools/devtools_agent.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc index 575c035..f5b629c 100644 --- a/content/renderer/devtools/devtools_agent.cc +++ b/content/renderer/devtools/devtools_agent.cc @@ -129,7 +129,7 @@ void DevToolsAgent::clearBrowserCookies() { Send(new DevToolsHostMsg_ClearBrowserCookies(routing_id())); } -#if defined(USE_TCMALLOC) && !defined(OS_WIN) +#if defined(USE_TCMALLOC) && !defined(OS_WIN) && !defined(USE_SYSTEM_TCMALLOC) static void AllocationVisitor(void* data, const void* ptr) { typedef WebKit::WebDevToolsAgentClient::AllocatedObjectVisitor Visitor; Visitor* visitor = reinterpret_cast<Visitor*>(data); @@ -138,7 +138,7 @@ static void AllocationVisitor(void* data, const void* ptr) { #endif void DevToolsAgent::visitAllocatedObjects(AllocatedObjectVisitor* visitor) { -#if defined(USE_TCMALLOC) && !defined(OS_WIN) +#if defined(USE_TCMALLOC) && !defined(OS_WIN) && !defined(USE_SYSTEM_TCMALLOC) IterateAllocatedObjects(&AllocationVisitor, visitor); #endif } |