content/renderer/render_thread_impl.cc - Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_thread_impl.cc

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Rebasec Created 8 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/browser/zygote_host_impl_linux.cc ('k') | third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-gcc.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 1f5216ed4f9533713f755b492b2e63b5a67affc2..217732fd7c118ed75c6c64bee12bd1eba089d8dc 100644

--- a/content/renderer/render_thread_impl.cc

+++ b/content/renderer/render_thread_impl.cc

@@ -57,7 +57,7 @@

#include "ipc/ipc_platform_file.h"

#include "net/base/net_errors.h"

#include "net/base/net_util.h"

-#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"

+#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"

« no previous file with comments | « content/browser/zygote_host_impl_linux.cc ('k') | third_party/tcmalloc/chromium/src/base/atomicops-internals-arm-gcc.h » ('j') | no next file with comments »