Add ScopedSurfaceRequestManager

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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "content/browser/file_descriptor_info_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
+#include "gpu/ipc/common/android/scoped_surface_request_manager.h"
 #include "jni/ChildProcessLauncher_jni.h"
 #include "media/base/android/media_player_android.h"
 #include "ui/gl/android/surface_texture.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaParamRef;
 using base::android::ToJavaArrayOfStrings;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using content::StartChildProcessCallback;
@@ skipping 45 matching lines @@
     DVLOG(1) << "Cannot find media player for player_id " << player_id;
     return;
   }
 
   if (player != player_manager->GetFullscreenPlayer()) {
     gl::ScopedJavaSurface scoped_surface(surface);
     player->SetVideoSurface(std::move(scoped_surface));
   }
 }
 
+static void GetAndCompleteScopedSurfaceRequest(
+    const base::android::JavaRef<jobject>& surface,
+    uint64_t request_id) {
+  gpu::ScopedSurfaceRequestManager::ScopedSurfaceRequestCB surface_request =
+      gpu::ScopedSurfaceRequestManager::GetInstance()
+          ->GetAndUnregisterScopedSurfaceRequest(request_id);
+
+  if (!surface_request.is_null()) {
+    gl::ScopedJavaSurface scoped_surface(surface);
+    surface_request.Run(std::move(scoped_surface));
+  }
+}
+
 void LaunchDownloadProcess(base::CommandLine* cmd_line) {
   std::unique_ptr<base::CommandLine> cmd_line_deleter(cmd_line);
 
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
   // Create the Command line String[]
   ScopedJavaLocalRef<jobjectArray> j_argv =
       ToJavaArrayOfStrings(env, cmd_line->argv());
 
@@ skipping 126 matching lines @@
   ScopedJavaGlobalRef<jobject> jsurface;
   jsurface.Reset(env, surface);
   if (jsurface.is_null())
     return;
 
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &SetSurfacePeer, jsurface, pid, primary_id, secondary_id));
 }
 
+void CompleteScopedSurfaceRequest(JNIEnv* env,
+                                  const JavaParamRef<jclass>& clazz,
+                                  jlong request_id,
+                                  const JavaParamRef<jobject>& surface) {
+  ScopedJavaGlobalRef<jobject> jsurface;
+  jsurface.Reset(env, surface);
+  if (jsurface.is_null())
+    return;
+
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&GetAndCompleteScopedSurfaceRequest, jsurface, request_id));
+}
+
 void RegisterViewSurface(int surface_id, jobject j_surface) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_registerViewSurface(env, surface_id, j_surface);
 }
 
 void UnregisterViewSurface(int surface_id) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_unregisterViewSurface(env, surface_id);
@@ skipping 35 matching lines @@
 jboolean IsSingleProcess(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content