Revert of WebVR compositor bypass via BrowserMain context + mailbox

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"
@@ skipping 28 matching lines @@
 }
 
 VrShellDelegate* VrShellDelegate::GetNativeVrShellDelegate(JNIEnv* env,
                                                            jobject jdelegate) {
   return reinterpret_cast<VrShellDelegate*>(
       Java_VrShellDelegate_getNativePointer(env, jdelegate));
 }
 
 void VrShellDelegate::SetDelegate(device::GvrDelegate* delegate,
                                   gvr_context* context) {
+  context_ = context;
   delegate_ = delegate;
   // Clean up the non-presenting delegate.
-  if (delegate_ && non_presenting_delegate_) {
+  if (non_presenting_delegate_) {
+    device::mojom::VRVSyncProviderRequest request =
+        non_presenting_delegate_->OnSwitchToPresentingDelegate();
+    if (request.is_pending())
+      delegate->OnVRVsyncProviderRequest(std::move(request));
     non_presenting_delegate_ = nullptr;
     JNIEnv* env = AttachCurrentThread();
     Java_VrShellDelegate_shutdownNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
   }
   if (device_provider_) {
     device::GvrDevice* device = device_provider_->Device();
     device::GamepadDataFetcherManager::GetInstance()->AddFactory(
         new device::GvrGamepadDataFetcher::Factory(context, device->id()));
     device->OnDelegateChanged();
@@ skipping 62 matching lines @@
 void VrShellDelegate::ShowTab(int id) {
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_showTab(env, j_vr_shell_delegate_.obj(), id);
 }
 
 void VrShellDelegate::OpenNewTab(bool incognito) {
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_openNewTab(env, j_vr_shell_delegate_.obj(), incognito);
 }
 
-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 (!delegate_)
     CreateNonPresentingDelegate();
   device_provider_->Device()->OnDelegateChanged();
 }
 
 void VrShellDelegate::ClearDeviceProvider() {
   non_presenting_delegate_ = nullptr;
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_shutdownNonPresentingNativeContext(
       env, j_vr_shell_delegate_.obj());
   device_provider_ = nullptr;
 }
 
 void VrShellDelegate::RequestWebVRPresent(
-    device::mojom::VRSubmitFrameClientPtr submit_client,
     const base::Callback<void(bool)>& callback) {
   if (!present_callback_.is_null()) {
     // Can only handle one request at a time. This is also extremely unlikely to
     // happen in practice.
     callback.Run(false);
     return;
   }
 
   present_callback_ = std::move(callback);
-  submit_client_ = std::move(submit_client);
 
   // If/When VRShell is ready for use it will call SetPresentResult.
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_presentRequested(env, j_vr_shell_delegate_.obj());
 }
 
 void VrShellDelegate::ExitWebVRPresent() {
   // VRShell is no longer needed by WebVR, allow it to shut down if it's not
   // being used elsewhere.
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_exitWebVR(env, j_vr_shell_delegate_.obj());
 }
 
 base::WeakPtr<VrShellDelegate> VrShellDelegate::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
+void VrShellDelegate::OnVRVsyncProviderRequest(
+    device::mojom::VRVSyncProviderRequest request) {
+  GetDelegate()->OnVRVsyncProviderRequest(std::move(request));
+}
+
 void VrShellDelegate::CreateNonPresentingDelegate() {
   JNIEnv* env = AttachCurrentThread();
   gvr_context* context = reinterpret_cast<gvr_context*>(
       Java_VrShellDelegate_createNonPresentingNativeContext(
           env, j_vr_shell_delegate_.obj()));
+  if (!context)
+    return;
+  context_ = context;
   non_presenting_delegate_ =
       base::MakeUnique<NonPresentingGvrDelegate>(context);
   non_presenting_delegate_->UpdateVSyncInterval(timebase_nanos_,
                                                 interval_seconds_);
 }
 
 device::GvrDelegate* VrShellDelegate::GetDelegate() {
   if (delegate_)
     return delegate_;
   return non_presenting_delegate_.get();
@@ skipping 16 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