content/browser/child_process_launcher.cc - Issue 58203002: Android: remove ContentViewCore from the renderer crash codepath.

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 58203002: Android: remove ContentViewCore from the renderer crash codepath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 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

« no previous file with comments | « content/browser/android/web_contents_observer_android.cc ('k') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.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 3b95c14dc65d2f9aa0d52a074ff2d079e3946664..67d7bc2f785cfa305c1ffbbccdcfe7198491caac 100644

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

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

@@ -469,14 +469,19 @@ base::TerminationStatus ChildProcessLauncher::GetChildTerminationStatus(

if (context_->zygote_) {

context_->termination_status_ = ZygoteHostImpl::GetInstance()->

GetTerminationStatus(handle, known_dead, &context_->exit_code_);

- } else

+ } else {

#elif defined(OS_MACOSX)

if (known_dead) {

context_->termination_status_ =

base::GetKnownDeadTerminationStatus(handle, &context_->exit_code_);

- } else

-#endif

+ } else {

+#elif defined(OS_ANDROID)

+ if (IsChildProcessOomProtected(handle)) {

+ context_->termination_status_ = base::TERMINATION_STATUS_OOM_PROTECTED;

+ } else {

+#else

{

+#endif

context_->termination_status_ =

base::GetTerminationStatus(handle, &context_->exit_code_);

}