Revert of mojo VR interface simplified

device/vr/android/gvr/gvr_device.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 "device/vr/android/gvr/gvr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/time/time.h"
@@ skipping 11 matching lines @@
 
 static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
 
 }  // namespace
 
 GvrDevice::GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate)
     : VRDevice(provider), delegate_(delegate), gvr_provider_(provider) {}
 
 GvrDevice::~GvrDevice() {}
 
-mojom::VRDisplayInfoPtr GvrDevice::GetVRDevice() {
+VRDisplayPtr GvrDevice::GetVRDevice() {
   TRACE_EVENT0("input", "GvrDevice::GetVRDevice");
 
-  mojom::VRDisplayInfoPtr device = mojom::VRDisplayInfo::New();
+  VRDisplayPtr device = VRDisplay::New();
 
   device->index = id();
 
-  device->capabilities = mojom::VRDisplayCapabilities::New();
+  device->capabilities = VRDisplayCapabilities::New();
   device->capabilities->hasOrientation = true;
   device->capabilities->hasPosition = false;
   device->capabilities->hasExternalDisplay = false;
   device->capabilities->canPresent = true;
 
-  device->leftEye = mojom::VREyeParameters::New();
-  device->rightEye = mojom::VREyeParameters::New();
-  mojom::VREyeParametersPtr& left_eye = device->leftEye;
-  mojom::VREyeParametersPtr& right_eye = device->rightEye;
+  device->leftEye = VREyeParameters::New();
+  device->rightEye = VREyeParameters::New();
+  VREyeParametersPtr& left_eye = device->leftEye;
+  VREyeParametersPtr& right_eye = device->rightEye;
 
-  left_eye->fieldOfView = mojom::VRFieldOfView::New();
-  right_eye->fieldOfView = mojom::VRFieldOfView::New();
+  left_eye->fieldOfView = VRFieldOfView::New();
+  right_eye->fieldOfView = VRFieldOfView::New();
 
   left_eye->offset = mojo::Array<float>::New(3);
   right_eye->offset = mojo::Array<float>::New(3);
 
   // TODO(bajones): GVR has a bug that causes it to return bad render target
   // sizes when the phone is in portait mode. Send arbitrary,
   // not-horrifically-wrong values instead.
   //  gvr::Sizei render_target_size = gvr_api->GetRecommendedRenderTargetSize();
   left_eye->renderWidth = 1024;   // render_target_size.width / 2;
   left_eye->renderHeight = 1024;  // render_target_size.height;
@@ skipping 58 matching lines @@
   left_eye->offset[2] = -left_eye_mat.m[2][3];
 
   gvr::Mat4f right_eye_mat = gvr_api->GetEyeFromHeadMatrix(GVR_RIGHT_EYE);
   right_eye->offset[0] = -right_eye_mat.m[0][3];
   right_eye->offset[1] = -right_eye_mat.m[1][3];
   right_eye->offset[2] = -right_eye_mat.m[2][3];
 
   return device;
 }
 
-mojom::VRPosePtr GvrDevice::GetPose(VRServiceImpl* service) {
+VRPosePtr GvrDevice::GetPose() {
   TRACE_EVENT0("input", "GvrDevice::GetSensorState");
 
-  if (!IsAccessAllowed(service))
-    return nullptr;
-
-  mojom::VRPosePtr pose = mojom::VRPose::New();
+  VRPosePtr pose = VRPose::New();
 
   pose->timestamp = base::Time::Now().ToJsTime();
 
   // Increment pose frame counter always, even if it's a faked pose.
   pose->poseIndex = ++pose_index_;
 
   pose->orientation = mojo::Array<float>::New(4);
 
   gvr::GvrApi* gvr_api = GetGvrApi();
   if (!gvr_api) {
@@ skipping 35 matching lines @@
     pose->position[2] = decomposed_transform.translate[2];
   }
 
   // Save the underlying GVR pose for use by rendering. It can't use a
   // VRPosePtr since that's a different data type.
   delegate_->SetGvrPoseForWebVr(head_mat, pose_index_);
 
   return pose;
 }
 
-void GvrDevice::ResetPose(VRServiceImpl* service) {
-  if (!IsAccessAllowed(service))
-    return;
-
+void GvrDevice::ResetPose() {
   gvr::GvrApi* gvr_api = GetGvrApi();
 
   // Should never call RecenterTracking when using with Daydream viewers. On
   // those devices recentering should only be done via the controller.
   if (gvr_api && gvr_api->GetViewerType() == GVR_VIEWER_TYPE_CARDBOARD)
     gvr_api->RecenterTracking();
 }
 
-bool GvrDevice::RequestPresent(VRServiceImpl* service, bool secure_origin) {
-  if (!IsAccessAllowed(service))
-    return false;
-
-  // One service could present on several devices at the same time
-  // and different service could present on different devices the same time
-  if (presenting_service_ == nullptr)
-    presenting_service_ = service;
-
+bool GvrDevice::RequestPresent(bool secure_origin) {
   secure_origin_ = secure_origin;
   if (delegate_)
     delegate_->SetWebVRSecureOrigin(secure_origin_);
-
   return gvr_provider_->RequestPresent();
 }
 
-void GvrDevice::ExitPresent(VRServiceImpl* service) {
-  if (IsPresentingService(service))
-    presenting_service_ = nullptr;
-
+void GvrDevice::ExitPresent() {
   gvr_provider_->ExitPresent();
-  OnExitPresent(service);
 }
 
-void GvrDevice::SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) {
-  if (!IsPresentingService(service) || !delegate_)
-    return;
-  delegate_->SubmitWebVRFrame();
+void GvrDevice::SubmitFrame(VRPosePtr pose) {
+  if (delegate_)
+    delegate_->SubmitWebVRFrame();
 }
 
-void GvrDevice::UpdateLayerBounds(VRServiceImpl* service,
-                                  mojom::VRLayerBoundsPtr leftBounds,
-                                  mojom::VRLayerBoundsPtr rightBounds) {
-  if (!IsAccessAllowed(service) || !delegate_)
+void GvrDevice::UpdateLayerBounds(VRLayerBoundsPtr leftBounds,
+                                  VRLayerBoundsPtr rightBounds) {
+  if (!delegate_)
     return;
 
   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);
 }
 
 void GvrDevice::SetDelegate(GvrDelegate* delegate) {
   delegate_ = delegate;
 
   // Notify the clients that this device has changed
   if (delegate_) {
     delegate_->SetWebVRSecureOrigin(secure_origin_);
-    OnDisplayChanged();
+    VRDeviceManager::GetInstance()->OnDeviceChanged(GetVRDevice());
   }
 }
 
 gvr::GvrApi* GvrDevice::GetGvrApi() {
   if (!delegate_)
     return nullptr;
 
   return delegate_->gvr_api();
 }
 
 }  // namespace device