Index: content/browser/android/child_process_launcher_android.cc |
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc |
index cf915e4a42a837de1f7a824c63964e205cbbbe4f..611c58320dd6f7702d95c82a47579f63c0566672 100644 |
--- a/content/browser/android/child_process_launcher_android.cc |
+++ b/content/browser/android/child_process_launcher_android.cc |
@@ -159,6 +159,16 @@ jobject GetViewSurface(JNIEnv* env, jclass clazz, jint surface_id) { |
return CompositorImpl::GetSurface(surface_id); |
} |
+jobject GetSurfaceTextureSurface(JNIEnv* env, |
+ jclass clazz, |
+ jint surface_texture_id) { |
+ // This is a synchronous call from a renderer process and is expected to be |
+ // handled on a binder thread. Handling this on the UI thread will lead |
+ // to deadlocks. |
+ DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ return CompositorImpl::GetSurfaceTextureSurface(surface_texture_id); |
+} |
+ |
jboolean IsSingleProcess(JNIEnv* env, jclass clazz) { |
return CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess); |
} |