Index: content/browser/android/child_process_launcher_android.h |
diff --git a/content/browser/android/child_process_launcher_android.h b/content/browser/android/child_process_launcher_android.h |
index a9e6ddc5cd0cf1368c6fd5398a4b9e49dbc73fee..05a186d8b193e8ff5689f3b23c2fcf7b40b9bdac 100644 |
--- a/content/browser/android/child_process_launcher_android.h |
+++ b/content/browser/android/child_process_launcher_android.h |
@@ -11,6 +11,7 @@ |
#include "base/command_line.h" |
#include "base/process/process.h" |
#include "content/public/browser/file_descriptor_info.h" |
+#include "ui/gl/android/scoped_java_surface.h" |
namespace content { |
@@ -37,12 +38,14 @@ void RegisterViewSurface(int surface_id, jobject j_surface); |
void UnregisterViewSurface(int surface_id); |
-void RegisterChildProcessSurfaceTexture(int surface_texture_id, |
- int child_process_id, |
- jobject j_surface_texture); |
+void RegisterSurfaceTexture(int surface_texture_id, |
+ int client_id, |
+ jobject j_surface_texture); |
-void UnregisterChildProcessSurfaceTexture(int surface_texture_id, |
- int child_process_id); |
+void UnregisterSurfaceTexture(int surface_texture_id, int client_id); |
+ |
+gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id, |
+ int client_id); |
bool RegisterChildProcessLauncher(JNIEnv* env); |