| 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 6b9c483357e97732072fde0227d133cf98b375a6..4ed60d7d84d2cbbe099e74e76ab38ec028e8e3e2 100644
|
| --- a/content/browser/android/child_process_launcher_android.cc
|
| +++ b/content/browser/android/child_process_launcher_android.cc
|
| @@ -13,7 +13,9 @@
|
| #include "base/android/context_utils.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_array.h"
|
| +#include "base/android/jni_string.h"
|
| #include "base/logging.h"
|
| +#include "content/browser/android/scoped_surface_request_manager.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"
|
| @@ -237,6 +239,19 @@ void EstablishSurfacePeer(JNIEnv* env,
|
| &SetSurfacePeer, jsurface, pid, primary_id, secondary_id));
|
| }
|
|
|
| +void CompleteScopedSurfaceRequest(JNIEnv* env,
|
| + const JavaParamRef<jclass>& clazz,
|
| + const JavaParamRef<jstring>& request_token,
|
| + const JavaParamRef<jobject>& surface) {
|
| + ScopedJavaGlobalRef<jobject> jsurface;
|
| + jsurface.Reset(env, surface);
|
| + gl::ScopedJavaSurface scoped_surface(jsurface);
|
| +
|
| + ScopedSurfaceRequestManager::GetInstance()->FulfillScopedSurfaceRequest(
|
| + base::android::ConvertJavaStringToUTF8(env, request_token),
|
| + std::move(scoped_surface));
|
| +}
|
| +
|
| void RegisterViewSurface(int surface_id, const JavaRef<jobject>& j_surface) {
|
| JNIEnv* env = AttachCurrentThread();
|
| DCHECK(env);
|
|
|