Plumbing through more WebVR presentation code

device/vr/android/gvr/gvr_device.cc

Index: device/vr/android/gvr/gvr_device.cc
diff --git a/device/vr/android/gvr/gvr_device.cc b/device/vr/android/gvr/gvr_device.cc
index 2de6b12f0c8de234f8cee89354b35d8e0b0028d3..f3eebd59c73aa5acbea725c52c065e584428d15d 100644
--- a/device/vr/android/gvr/gvr_device.cc
+++ b/device/vr/android/gvr/gvr_device.cc
@@ -9,6 +9,7 @@
 
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
+#include "device/vr/android/gvr/gvr_delegate.h"
 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/transform.h"
@@ -22,14 +23,16 @@ static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
 
 }  // namespace
 
-GvrDevice::GvrDevice(VRDeviceProvider* provider, gvr::GvrApi* gvr_api)
-    : VRDevice(provider), gvr_api_(gvr_api) {}
+GvrDevice::GvrDevice(VRDeviceProvider* provider, GvrDelegate* delegate)
+    : VRDevice(provider), delegate_(delegate) {}
 
 GvrDevice::~GvrDevice() {}
 
 VRDisplayPtr GvrDevice::GetVRDevice() {
   TRACE_EVENT0("input", "GvrDevice::GetVRDevice");
 
+  gvr::GvrApi* gvr_api = delegate_->gvr_api();
+
   VRDisplayPtr device = VRDisplay::New();
 
   device->capabilities = VRDisplayCapabilities::New();
@@ -43,13 +46,13 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
   VREyeParametersPtr& left_eye = device->leftEye;
   VREyeParametersPtr& right_eye = device->rightEye;
 
-  device->displayName = gvr_api_->GetViewerModel();
+  device->displayName = gvr_api->GetViewerModel();
 
   gvr::BufferViewportList gvr_buffer_viewports =
-      gvr_api_->CreateEmptyBufferViewportList();
+      gvr_api->CreateEmptyBufferViewportList();
   gvr_buffer_viewports.SetToRecommendedBufferViewports();
 
-  gvr::BufferViewport eye_viewport = gvr_api_->CreateBufferViewport();
+  gvr::BufferViewport eye_viewport = gvr_api->CreateBufferViewport();
   gvr_buffer_viewports.GetBufferViewport(GVR_LEFT_EYE, &eye_viewport);
   gvr::Rectf eye_fov = eye_viewport.GetSourceFov();
   left_eye->fieldOfView = VRFieldOfView::New();
@@ -58,7 +61,7 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
   left_eye->fieldOfView->leftDegrees = eye_fov.left;
   left_eye->fieldOfView->rightDegrees = eye_fov.right;
 
-  eye_viewport = gvr_api_->CreateBufferViewport();
+  eye_viewport = gvr_api->CreateBufferViewport();
   gvr_buffer_viewports.GetBufferViewport(GVR_RIGHT_EYE, &eye_viewport);
   eye_fov = eye_viewport.GetSourceFov();
   right_eye->fieldOfView = VRFieldOfView::New();
@@ -67,8 +70,8 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
   right_eye->fieldOfView->leftDegrees = eye_fov.left;
   right_eye->fieldOfView->rightDegrees = eye_fov.right;
 
-  gvr::Mat4f left_eye_mat = gvr_api_->GetEyeFromHeadMatrix(GVR_LEFT_EYE);
-  gvr::Mat4f right_eye_mat = gvr_api_->GetEyeFromHeadMatrix(GVR_RIGHT_EYE);
+  gvr::Mat4f left_eye_mat = gvr_api->GetEyeFromHeadMatrix(GVR_LEFT_EYE);
+  gvr::Mat4f right_eye_mat = gvr_api->GetEyeFromHeadMatrix(GVR_RIGHT_EYE);
 
   left_eye->offset = mojo::Array<float>::New(3);
   left_eye->offset[0] = -left_eye_mat.m[0][3];
@@ -80,13 +83,16 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
   right_eye->offset[1] = -right_eye_mat.m[1][3];
   right_eye->offset[2] = -right_eye_mat.m[2][3];
 
-  gvr::Sizei render_target_size = gvr_api_->GetRecommendedRenderTargetSize();
+  //  gvr::Sizei render_target_size = gvr_api->GetRecommendedRenderTargetSize();
 
-  left_eye->renderWidth = render_target_size.width / 2;
-  left_eye->renderHeight = render_target_size.height;
+  // TODO(bajones): GVR has a bug that causes it to return bad render target

[mthiesse, 2016/09/06 20:10:38]

FYI: We fix this for VrShell by forcing landscape mode before we initialize gvr.
I expect this option isn't really available to you... so good luck?

You can probably come up with better not-horrifically-wrong values by looking at
the display width/height if you can somehow get that information here. Feel free
to not do that in this CL though.

+  // sizes when the phone is in portait mode. Send arbitrary,
+  // not-horrifically-wrong values instead.
+  left_eye->renderWidth = 1024;   // render_target_size.width / 2;
+  left_eye->renderHeight = 1024;  // render_target_size.height;
 
-  right_eye->renderWidth = render_target_size.width / 2;
-  right_eye->renderHeight = render_target_size.height;
+  right_eye->renderWidth = left_eye->renderWidth;
+  right_eye->renderHeight = left_eye->renderHeight;
 
   return device;
 }
@@ -94,6 +100,8 @@ VRDisplayPtr GvrDevice::GetVRDevice() {
 VRPosePtr GvrDevice::GetPose() {
   TRACE_EVENT0("input", "GvrDevice::GetSensorState");
 
+  gvr::GvrApi* gvr_api = delegate_->gvr_api();
+
   VRPosePtr pose = VRPose::New();
 
   pose->timestamp = base::Time::Now().ToJsTime();
@@ -101,7 +109,7 @@ VRPosePtr GvrDevice::GetPose() {
   gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
   target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
 
-  gvr::Mat4f head_mat = gvr_api_->GetHeadPoseInStartSpace(target_time);
+  gvr::Mat4f head_mat = gvr_api->GetHeadPoseInStartSpace(target_time);
 
   gfx::Transform inv_transform(
       head_mat.m[0][0], head_mat.m[0][1], head_mat.m[0][2], head_mat.m[0][3],
@@ -130,7 +138,29 @@ VRPosePtr GvrDevice::GetPose() {
 }
 
 void GvrDevice::ResetPose() {
-  gvr_api_->ResetTracking();
+  delegate_->gvr_api()->ResetTracking();
+}
+
+void GvrDevice::RequestPresent() {
+  delegate_->RequestWebVRPresent();
+}
+
+void GvrDevice::ExitPresent() {
+  delegate_->ExitWebVRPresent();
+}
+
+void GvrDevice::SubmitFrame() {
+  delegate_->SubmitWebVRFrame();
+}
+
+void GvrDevice::UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
+                                  VRLayerBoundsPtr rightBounds) {
+  delegate_->UpdateWebVRTextureBounds(0,  // Left eye
+                                      leftBounds->left, leftBounds->top,
+                                      leftBounds->width, leftBounds->height);
+  delegate_->UpdateWebVRTextureBounds(1,  // Right eye
+                                      rightBounds->left, rightBounds->top,
+                                      rightBounds->width, rightBounds->height);
 }
 
 }  // namespace device