content/browser/child_process_launcher.cc - Issue 1156183003: Pass file Regions along with FDs to child processes on Android

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/child_process_launcher.cc

Issue 1156183003: Pass file Regions along with FDs to child processes on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add operator!= for Region Created 5 years, 7 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

« base/files/memory_mapped_file.cc ('K') | « content/browser/android/child_process_launcher_android.cc ('k') | content/public/android/java/src/org/chromium/content/app/ChildProcessService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/child_process_launcher.cc

diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc

index 28be72bb9c32eb853702adbdb0726379a3f9825c..67f17a218928b829d7f9f48ce930f290ee57b8f4 100644

--- a/content/browser/child_process_launcher.cc

+++ b/content/browser/child_process_launcher.cc

@@ -144,12 +144,12 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,

// Android WebView runs in single process, ensure that we never get here

// when running in single process mode.

CHECK(!cmd_line->HasSwitch(switches::kSingleProcess));

+ std::map<int, base::MemoryMappedFile::Region> regions;

GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(

*cmd_line, child_process_id, files_to_register.get());

StartChildProcess(

- cmd_line->argv(), child_process_id, files_to_register.Pass(),

+ cmd_line->argv(), child_process_id, files_to_register.Pass(), regions,

base::Bind(&OnChildProcessStartedAndroid, callback, client_thread_id,

begin_launch_time, base::Passed(&ipcfd)));