Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java

Issue 2809293005: android: assert runningOnLauncherThread (Closed)
Patch Set: assert Created 3 years, 8 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
Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java
index da5e8d2b7444fbb9215b1904ef3076c0bdf6b4cc..71d30e883257233febfdf7d2f84c6fd8917a77a5 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java
@@ -29,10 +29,10 @@ class ChildProcessLauncherHelper {
private long mNativeChildProcessLauncherHelper;
private int mPid;
- // Called on launcher thread.
@CalledByNative
private static FileDescriptorInfo makeFdInfo(
int id, int fd, boolean autoClose, long offset, long size) {
+ assert LauncherThread.runningOnLauncherThread();
ParcelFileDescriptor pFd;
if (autoClose) {
// Adopt the FD, it will be closed when we close the ParcelFileDescriptor.
@@ -48,17 +48,18 @@ class ChildProcessLauncherHelper {
return new FileDescriptorInfo(id, pFd, offset, size);
}
- // Called on launcher thread.
@CalledByNative
private static ChildProcessLauncherHelper create(long nativePointer, Context context,
int paramId, final String[] commandLine, int childProcessId,
FileDescriptorInfo[] filesToBeMapped) {
+ assert LauncherThread.runningOnLauncherThread();
return new ChildProcessLauncherHelper(
nativePointer, context, paramId, commandLine, childProcessId, filesToBeMapped);
}
private ChildProcessLauncherHelper(long nativePointer, Context context, int paramId,
final String[] commandLine, int childProcessId, FileDescriptorInfo[] filesToBeMapped) {
+ assert LauncherThread.runningOnLauncherThread();
mNativeChildProcessLauncherHelper = nativePointer;
ChildProcessLauncher.start(context, paramId, commandLine, childProcessId, filesToBeMapped,
@@ -80,13 +81,14 @@ class ChildProcessLauncherHelper {
return ChildProcessLauncher.getBindingManager().isOomProtected(mPid);
}
- // Called on launcher thread.
@CalledByNative
private void setInForeground(int pid, boolean inForeground) {
+ assert LauncherThread.runningOnLauncherThread();
assert mPid == pid;
ChildProcessLauncher.getBindingManager().setInForeground(mPid, inForeground);
}
+ // Called on client (UI or IO) thread and launcher thread.
@CalledByNative
private static void stop(int pid) {
ChildProcessLauncher.stop(pid);

Powered by Google App Engine
This is Rietveld 408576698