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

Unified Diff: content/renderer/devtools/devtools_agent.cc

Issue 12224030: Linux: add option to use system tcmalloc (off by default) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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
« no previous file with comments | « content/content_renderer.gypi ('k') | tools/generate_shim_headers/generate_shim_headers.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/devtools/devtools_agent.cc
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
index 575c035e2b8b66e5fa37332ee84b1a6151225734..f5b629cbe9d60b0072b8654f92f5b4c2e9392b70 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
}
« no previous file with comments | « content/content_renderer.gypi ('k') | tools/generate_shim_headers/generate_shim_headers.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698