content/public/android/java/src/org/chromium/content/app/ChildProcessService.java - Issue 19957002: Run the later parts of startup as UI thread tasks

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/public/android/java/src/org/chromium/content/app/ChildProcessService.java

Issue 19957002: Run the later parts of startup as UI thread tasks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 5 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/android/browser_jni_registrar.cc ('K') | « content/content_tests.gypi ('k') | content/public/android/java/src/org/chromium/content/app/ContentMain.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

index 3d85310926cb657db415002f0e5e2b7bc5eb8090..016ffe40f6207f0ce5aaba0b57b5af20aeefee47 100644

--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

@@ -19,6 +19,7 @@ import android.view.Surface;

import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.content.browser.ChildProcessConnection;

+import org.chromium.content.browser.StartupObserver;

import org.chromium.content.common.IChildProcessCallback;

import org.chromium.content.common.IChildProcessService;

import org.chromium.content.browser.ChildProcessLauncher;

@@ -138,11 +139,12 @@ public class ChildProcessService extends Service {

fileIds[i] = mFileIds.get(i);

fileFds[i] = mFileFds.get(i).detachFd();

}

- ContentMain.initApplicationContext(sContext.get().getApplicationContext());

+ ContentMain contentMain = new ContentMain();

+ contentMain.initApplicationContext(sContext.get().getApplicationContext());

nativeInitChildProcess(sContext.get().getApplicationContext(),

ChildProcessService.this, fileIds, fileFds,

mCpuCount, mCpuFeatures);

- ContentMain.start();

+ contentMain.start(true, new StartupObserver());

nativeExitChildProcess();

} catch (InterruptedException e) {

Log.w(TAG, MAIN_THREAD_NAME + " startup failed: " + e);