chrome/renderer/chrome_render_process_observer.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: chrome/renderer/chrome_render_process_observer.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

Index: chrome/renderer/chrome_render_process_observer.cc

diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc

index ed58e72b50d51e022889f08a343d1b6f32c7aacf..9c95fe7265fe3f8c9b1986bb10e43a017d9f80d4 100644

--- a/chrome/renderer/chrome_render_process_observer.cc

+++ b/chrome/renderer/chrome_render_process_observer.cc

@@ -33,8 +33,8 @@

#include "net/base/net_errors.h"

#include "net/base/net_module.h"

#include "third_party/sqlite/sqlite3.h"

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

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

+#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"

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

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

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

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

« no previous file with comments | « chrome/browser/ui/webui/about_ui.cc ('k') | content/browser/zygote_host_impl_linux.cc » ('j') | no next file with comments »