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

Unified Diff: content/app/android/child_process_service.cc

Issue 1278823006: Fix a few CHECK_JNI failures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | content/app/android/content_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/android/child_process_service.cc
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index c6301aebdddf5f114a499f692fee20deaa208e10..d3e6a1bf473883a57a4e69800e0b5721999096b5 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -133,11 +133,11 @@ class SurfaceTextureManagerImpl : public SurfaceTextureManager,
// processes such as renderers, plugins, etc.
void InternalInitChildProcess(JNIEnv* env,
jclass clazz,
- jobject context,
jobject service_in,
jint cpu_count,
jlong cpu_features) {
- base::android::ScopedJavaLocalRef<jobject> service(env, service_in);
+ base::android::ScopedJavaLocalRef<jobject> service(
+ env, env->NewLocalRef(service_in));
// Set the CPU properties.
android_setCpu(cpu_count, cpu_features);
@@ -160,12 +160,10 @@ void RegisterGlobalFileDescriptor(JNIEnv* env,
void InitChildProcess(JNIEnv* env,
jclass clazz,
- jobject context,
jobject service,
jint cpu_count,
jlong cpu_features) {
- InternalInitChildProcess(env, clazz, context, service, cpu_count,
- cpu_features);
+ InternalInitChildProcess(env, clazz, service, cpu_count, cpu_features);
}
void ExitChildProcess(JNIEnv* env, jclass clazz) {
« no previous file with comments | « no previous file | content/app/android/content_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698