Fixes WebVR presentation from within VRShell.

chrome/browser/android/vr_shell/vr_shell_delegate.cc

 // Copyright 2016 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 "chrome/browser/android/vr_shell/vr_shell_delegate.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "chrome/browser/android/vr_shell/non_presenting_gvr_delegate.h"
 #include "device/vr/android/gvr/gvr_device.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "jni/VrShellDelegate_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::AttachCurrentThread;
 
 namespace vr_shell {
 
 VrShellDelegate::VrShellDelegate(JNIEnv* env, jobject obj) {
   DVLOG(1) << __FUNCTION__ << "=" << this;
   j_vr_shell_delegate_.Reset(env, obj);
 }
 
 VrShellDelegate::~VrShellDelegate() {

[mthiesse, 2017/03/30 15:29:46]

While you're cleaning this up, can you make sure that if the present_callback_
isn't null that we make sure it's run here?

[tiborg, 2017/03/30 22:19:57]

Done.

   DVLOG(1) << __FUNCTION__ << "=" << this;
   if (device_provider_) {
     device_provider_->Device()->OnExitPresent();
     device_provider_->Device()->OnDelegateChanged();
   }
 }
 
 device::GvrDelegateProvider* VrShellDelegate::CreateVrShellDelegate() {
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> jdelegate =
@@ skipping 19 matching lines @@
     JNIEnv* env = AttachCurrentThread();
     Java_VrShellDelegate_shutdownNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
   }
   if (device_provider_) {
     device::GvrDevice* device = device_provider_->Device();
     device->OnDelegateChanged();
   }
 
   presenting_delegate_->UpdateVSyncInterval(timebase_nanos_, interval_seconds_);
+
+  if (pending_successful_present_request_) {
+    presenting_delegate_->SetSubmitClient(std::move(submit_client_));
+    present_callback_.Run(true);

[mthiesse, 2017/03/30 15:29:46]

nit: base::ResetAndReturn(presenting_delegate_).Run(true)

Also below.

[tiborg, 2017/03/30 22:19:57]

Done.

+    present_callback_.Reset();
+    pending_successful_present_request_ = false;
+  }
 }
 
 void VrShellDelegate::RemoveDelegate() {
   presenting_delegate_ = nullptr;
   if (device_provider_) {
     CreateNonPresentingDelegate();
     device_provider_->Device()->OnExitPresent();
     device_provider_->Device()->OnDelegateChanged();
   }
 }
 
 void VrShellDelegate::SetPresentResult(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj,
-                                       jboolean result) {
+                                       jboolean success) {
   CHECK(!present_callback_.is_null());
-  present_callback_.Run(result);
+  if (success && !presenting_delegate_) {
+    // We have to wait until the GL thread is ready since we have to pass it
+    // the VRSubmitFrameClient.
+    pending_successful_present_request_ = true;
+    return;
+  }
+
+  if (success) {
+    presenting_delegate_->SetSubmitClient(std::move(submit_client_));
+  }
+
+  present_callback_.Run(success);
   present_callback_.Reset();
+  pending_successful_present_request_ = false;
 }
 
 void VrShellDelegate::DisplayActivate(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   if (device_provider_) {
     device_provider_->Device()->OnActivate(
         device::mojom::VRDisplayEventReason::MOUNTED);
   }
 }
 
@@ skipping 22 matching lines @@
 void VrShellDelegate::OnResume(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   if (non_presenting_delegate_) {
     non_presenting_delegate_->Resume();
   }
 }
 
 void VrShellDelegate::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
-device::mojom::VRSubmitFrameClientPtr VrShellDelegate::TakeSubmitFrameClient() {
-  return std::move(submit_client_);
-}
-
 void VrShellDelegate::SetDeviceProvider(
     device::GvrDeviceProvider* device_provider) {
   if (device_provider_ == device_provider)
     return;
   if (device_provider_)
     ClearDeviceProvider();
   CHECK(!device_provider_);
   device_provider_ = device_provider;
   if (!presenting_delegate_) {
     CreateNonPresentingDelegate();
@@ skipping 69 matching lines @@
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj));
 }
 
 static void OnLibraryAvailable(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   device::GvrDelegateProvider::SetInstance(
       base::Bind(&VrShellDelegate::CreateVrShellDelegate));
 }
 
 }  // namespace vr_shell