WebVR compositor bypass via BrowserMain context + mailbox

chrome/browser/android/vr_shell/vr_shell.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.h"
 
 #include <android/native_window_jni.h>
 
 #include <string>
 #include <utility>
@@ skipping 18 matching lines @@
 #include "chrome/browser/android/vr_shell/vr_web_contents_observer.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/referrer.h"
 #include "device/vr/android/gvr/gvr_device.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
+#include "gpu/command_buffer/common/mailbox.h"
 #include "jni/VrShellImpl_jni.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
@@ skipping 268 matching lines @@
                            jboolean incognito,
                            jint id) {
   html_interface_->RemoveTab(incognito, id);
 }
 
 void VrShell::SetWebVRSecureOrigin(bool secure_origin) {
   // TODO(cjgrant): Align this state with the logic that drives the omnibox.
   html_interface_->SetWebVRSecureOrigin(secure_origin);
 }
 
-void VrShell::SubmitWebVRFrame() {}
+void VrShell::SubmitWebVRFrame(
+    int16_t frame_index,
+    const gpu::MailboxHolder& mailbox,
+    device::mojom::VRSubmitFrameClientPtr submit_client) {
+  TRACE_EVENT1("gpu", "SubmitWebVRFrame", "frame", frame_index);
+
+  // Save the submit completion client for later, we'll call the
+  // next lifecycle stages on it later. Use extra boolean maps
+  // to track when they get called since they could potentially
+  // be out of order, do cleanup once both were called.
+  webvr_submit_clients_.insert(
+      std::make_pair(frame_index, std::move(submit_client)));
+  webvr_submit_client_transferring_.insert({frame_index, true});
+  webvr_submit_client_rendering_.insert({frame_index, true});
+
+  PostToGlThreadWhenReady(base::Bind(&VrShellGl::SubmitWebVRFrame,
+                                     gl_thread_->GetVrShellGl(), frame_index,
+                                     mailbox));
+}
+
+void VrShell::OnSubmitWebVRFrameTransferred(int frame_index) {
+  DCHECK(webvr_submit_clients_.find(frame_index) !=
+         webvr_submit_clients_.end());
+  webvr_submit_clients_[frame_index]->OnSubmitFrameTransferred();
+  webvr_submit_client_transferring_[frame_index] = false;
+  if (!webvr_submit_client_rendering_[frame_index]) {
+    webvr_submit_clients_.erase(frame_index);
+    webvr_submit_client_transferring_.erase(frame_index);
+    webvr_submit_client_rendering_.erase(frame_index);
+  }
+}
+
+void VrShell::OnSubmitWebVRFrameRendered(int frame_index) {
+  DCHECK(webvr_submit_clients_.find(frame_index) !=
+         webvr_submit_clients_.end());
+  webvr_submit_clients_[frame_index]->OnSubmitFrameRendered();
+  webvr_submit_client_rendering_[frame_index] = false;
+  if (!webvr_submit_client_transferring_[frame_index]) {
+    webvr_submit_clients_.erase(frame_index);
+    webvr_submit_client_transferring_.erase(frame_index);
+    webvr_submit_client_rendering_.erase(frame_index);
+  }
+}
 
 void VrShell::UpdateWebVRTextureBounds(int16_t frame_index,
                                        const gvr::Rectf& left_bounds,
-                                       const gvr::Rectf& right_bounds) {
+                                       const gvr::Rectf& right_bounds,
+                                       const gvr::Sizei& source_size) {
   PostToGlThreadWhenReady(base::Bind(&VrShellGl::UpdateWebVRTextureBounds,
                                      gl_thread_->GetVrShellGl(), frame_index,
-                                     left_bounds, right_bounds));
+                                     left_bounds, right_bounds, source_size));
 }
 
 bool VrShell::SupportsPresentation() {
   return true;
 }
 
 void VrShell::ResetPose() {
   gl_thread_->task_runner()->PostTask(
       FROM_HERE, base::Bind(&VrShellGl::ResetPose, gl_thread_->GetVrShellGl()));
 }
@@ skipping 271 matching lines @@
     pose->position.value()[0] = decomposed_transform.translate[0];
     pose->position.value()[1] = decomposed_transform.translate[1];
     pose->position.value()[2] = decomposed_transform.translate[2];
   }
 
   return pose;
 }
 
 device::mojom::VRDisplayInfoPtr VrShell::CreateVRDisplayInfo(
     gvr::GvrApi* gvr_api,
-    gvr::Sizei compositor_size,
+    gvr::Sizei recommended_size,
     uint32_t device_id) {
   TRACE_EVENT0("input", "GvrDevice::GetVRDevice");
 
   device::mojom::VRDisplayInfoPtr device = device::mojom::VRDisplayInfo::New();
 
   device->index = device_id;
 
   device->capabilities = device::mojom::VRDisplayCapabilities::New();
   device->capabilities->hasOrientation = true;
   device->capabilities->hasPosition = false;
   device->capabilities->hasExternalDisplay = false;
   device->capabilities->canPresent = true;
 
   std::string vendor = gvr_api->GetViewerVendor();
   std::string model = gvr_api->GetViewerModel();
   device->displayName = vendor + " " + model;
 
   gvr::BufferViewportList gvr_buffer_viewports =
       gvr_api->CreateEmptyBufferViewportList();
   gvr_buffer_viewports.SetToRecommendedBufferViewports();
 
   device->leftEye = device::mojom::VREyeParameters::New();
   device->rightEye = device::mojom::VREyeParameters::New();
   for (auto eye : {GVR_LEFT_EYE, GVR_RIGHT_EYE}) {
     device::mojom::VREyeParametersPtr& eye_params =
         (eye == GVR_LEFT_EYE) ? device->leftEye : device->rightEye;
     eye_params->fieldOfView = device::mojom::VRFieldOfView::New();
     eye_params->offset.resize(3);
-    eye_params->renderWidth = compositor_size.width / 2;
-    eye_params->renderHeight = compositor_size.height;
+    eye_params->renderWidth = recommended_size.width / 2;
+    eye_params->renderHeight = recommended_size.height;
 
     gvr::BufferViewport eye_viewport = gvr_api->CreateBufferViewport();
     gvr_buffer_viewports.GetBufferViewport(eye, &eye_viewport);
     gvr::Rectf eye_fov = eye_viewport.GetSourceFov();
     eye_params->fieldOfView->upDegrees = eye_fov.top;
     eye_params->fieldOfView->downDegrees = eye_fov.bottom;
     eye_params->fieldOfView->leftDegrees = eye_fov.left;
     eye_params->fieldOfView->rightDegrees = eye_fov.right;
 
     gvr::Mat4f eye_mat = gvr_api->GetEyeFromHeadMatrix(eye);
@@ skipping 20 matching lines @@
            jboolean reprojected_rendering) {
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, reinterpret_cast<ui::WindowAndroid*>(content_window_android),
       content::WebContents::FromJavaWebContents(ui_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(ui_window_android), for_web_vr,
       VrShellDelegate::GetNativeVrShellDelegate(env, delegate),
       reinterpret_cast<gvr_context*>(gvr_api), reprojected_rendering));
 }
 
 }  // namespace vr_shell