content/child/child_thread_impl.cc - Issue 1361963002: Re-land architecture for cross-process memory notification suppressing

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/child/child_thread_impl.cc

Issue 1361963002: Re-land architecture for cross-process memory notification suppressing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch Created 5 years, 3 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

« content/browser/memory/memory_pressure_controller.cc ('K') | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/child/memory/child_memory_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/child_thread_impl.cc

diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc

index 890b30a7712e4a7bfb95964314b9722d56ba8441..2e89519f36cb9cb4aebfde33380aa809ac0dd0e3 100644

--- a/content/child/child_thread_impl.cc

+++ b/content/child/child_thread_impl.cc

@@ -39,6 +39,7 @@

#include "content/child/fileapi/file_system_dispatcher.h"

#include "content/child/fileapi/webfilesystem_impl.h"

#include "content/child/geofencing/geofencing_message_filter.h"

+#include "content/child/memory/child_memory_message_filter.h"

#include "content/child/mojo/mojo_application.h"

#include "content/child/notifications/notification_dispatcher.h"

#include "content/child/power_monitor_broadcast_source.h"

@@ -439,10 +440,11 @@ void ChildThreadImpl::Init(const Options& options) {

channel_->AddFilter(geofencing_message_filter_->GetFilter());

if (!IsInBrowserProcess()) {

- // In single process mode, browser-side tracing will cover the whole

- // process including renderers.

+ // In single process mode, browser-side tracing and memory will cover the

+ // whole process including renderers.

channel_->AddFilter(new tracing::ChildTraceMessageFilter(

ChildProcess::current()->io_task_runner()));

+ channel_->AddFilter(new ChildMemoryMessageFilter());

}

// In single process mode we may already have a power monitor