Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / android / child_process_launcher_android.h

diff --git a/src/content/browser/android/child_process_launcher_android.h b/src/content/browser/android/child_process_launcher_android.h
index 747649f..d1de985 100644 (file)
--- a/src/content/browser/android/child_process_launcher_android.h
+++ b/src/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 {
 
@@ -19,11 +20,10 @@ typedef base::Callback<void(base::ProcessHandle)> StartChildProcessCallback;
 // ActivityManager.
 // The created process handle is returned to the |callback| on success, 0 is
 // retuned if the process could not be created.
-void StartChildProcess(
-    const base::CommandLine::StringVector& argv,
-    int child_process_id,
-    const std::vector<FileDescriptorInfo>& files_to_register,
-    const StartChildProcessCallback& callback);
+void StartChildProcess(const base::CommandLine::StringVector& argv,
+                       int child_process_id,
+                       const scoped_ptr<FileDescriptorInfo> files_to_register,
+                       const StartChildProcessCallback& callback);
 
 // Stops a child process based on the handle returned form
 // StartChildProcess.
@@ -38,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 CreateSurfaceTextureSurface(int surface_texture_id,
+                                 int client_id,
+                                 gfx::SurfaceTexture* surface_texture);
 
-void UnregisterChildProcessSurfaceTexture(int surface_texture_id,
-                                          int child_process_id);
+void DestroySurfaceTextureSurface(int surface_texture_id, int client_id);
+
+gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
+                                                int client_id);
 
 bool RegisterChildProcessLauncher(JNIEnv* env);