content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java - Issue 874543003: Add support for TraceEvent before the native library is loaded.

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/browser/BrowserStartupController.java

Issue 874543003: Add support for TraceEvent before the native library is loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Selectively enable startup tracing in ChromeShell. Created 5 years, 11 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

« chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java ('K') | « content/browser/tracing/tracing_controller_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

index 5a12ca69bebf182e55db7b91ace698ead2daef9a..a295c6bcb1353d472fd12f105286bedaadc29b6e 100644

--- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

+++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

@@ -12,6 +12,7 @@ import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

import org.chromium.base.ResourceExtractor;

import org.chromium.base.ThreadUtils;

+import org.chromium.base.TraceEvent;

pasko 2015/01/27 15:36:02 nit: the TraceEvent.java has a comment at the top

Benoit L 2015/02/09 16:34:01 Done.

import org.chromium.base.VisibleForTesting;

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.LoaderErrors;

@@ -247,6 +248,7 @@ public class BrowserStartupController {

@VisibleForTesting

void prepareToStartBrowserProcess(boolean singleProcess) throws ProcessInitException {

+ TraceEvent.begin();

pasko 2015/01/27 15:36:02 does this compile? All the instances of TraceEvent

Benoit L 2015/02/09 16:34:01 Done.

Log.i(TAG, "Initializing chromium process, singleProcess=" + singleProcess);

// Normally Main.java will have kicked this off asynchronously for Chrome. But other

@@ -268,6 +270,8 @@ public class BrowserStartupController {

nativeSetCommandLineFlags(singleProcess, nativeIsPluginEnabled() ? getPlugins() : null);

ContentMain.initApplicationContext(appContext);

+ TraceEvent.end();

}

/**