content/browser/zygote_host/zygote_host_impl_linux.cc - Issue 1469843002: Remove dependency on allocator from 'content' targets

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/browser/zygote_host/zygote_host_impl_linux.cc

Issue 1469843002: Remove dependency on allocator from 'content' targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unify_allocator1_2

Patch Set: Fix build Created 5 years, 1 month 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

« base/allocator/allocator_extension.cc ('K') | « content/browser/renderer_host/memory_benchmark_message_filter.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/zygote_host/zygote_host_impl_linux.cc

diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc

index a11d51faea3c9b2fb85e9d337c09e0b0a76f404e..dadd99e8cf3773e850c2e2fed5641e0c8cc78afc 100644

--- a/content/browser/zygote_host/zygote_host_impl_linux.cc

+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc

@@ -487,7 +487,7 @@ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,

// If heap profiling is running, these processes are not exiting, at least

// on ChromeOS. The easiest thing to do is not launch them when profiling.

// TODO(stevenjb): Investigate further and fix.

- if (IsHeapProfilerRunning())

+ if (base::allocator::IsHeapProfilerRunning())

return;

#endif

std::vector<std::string> adj_oom_score_cmdline;