Add initial GpuMemoryBufferSurfaceTexture implementation.

content/browser/android/child_process_launcher_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/child_process_launcher_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 63 matching lines @@
                                   jint handle) {
   StartChildProcessCallback* callback =
       reinterpret_cast<StartChildProcessCallback*>(client_context);
   if (handle)
     callback->Run(static_cast<base::ProcessHandle>(handle));
   delete callback;
 }
 
 void StartChildProcess(
     const CommandLine::StringVector& argv,
+    int child_process_id,
     const std::vector<content::FileDescriptorInfo>& files_to_register,
     const StartChildProcessCallback& callback) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
   // Create the Command line String[]
   ScopedJavaLocalRef<jobjectArray> j_argv = ToJavaArrayOfStrings(env, argv);
 
   size_t file_count = files_to_register.size();
   DCHECK(file_count > 0);
@@ skipping 18 matching lines @@
     file_fds[i] = fd_info.fd.fd;
     file_auto_close[i] = fd_info.fd.auto_close;
   }
   env->ReleaseIntArrayElements(j_file_ids.obj(), file_ids, 0);
   env->ReleaseIntArrayElements(j_file_fds.obj(), file_fds, 0);
   env->ReleaseBooleanArrayElements(j_file_auto_close.obj(), file_auto_close, 0);
 
   Java_ChildProcessLauncher_start(env,
       base::android::GetApplicationContext(),
       j_argv.obj(),
+      child_process_id,
       j_file_ids.obj(),
       j_file_fds.obj(),
       j_file_auto_close.obj(),
       reinterpret_cast<intptr_t>(new StartChildProcessCallback(callback)));
 }
 
 void StopChildProcess(base::ProcessHandle handle) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_stop(env, static_cast<jint>(handle));
@@ skipping 17 matching lines @@
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &SetSurfacePeer, jsurface, pid, primary_id, secondary_id));
 }
 
 jobject GetViewSurface(JNIEnv* env, jclass clazz, jint surface_id) {
   // This is a synchronous call from the GPU 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::GetSurface(surface_id);
+  return CompositorImpl::GetSurface(surface_id).Release();
+}
+
+jobject GetSurfaceTextureSurface(JNIEnv* env,
+                                 jclass clazz,
+                                 jint surface_texture_id,
+                                 jint child_process_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,
+                                                  child_process_id).Release();
 }
 
 jboolean IsSingleProcess(JNIEnv* env, jclass clazz) {
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content