Fixes 2D-to-WebVR site transitions when browsing in VR.

device/vr/test/fake_vr_device.cc

 // Copyright 2015 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/test/fake_vr_device.h"
 
 namespace device {
 
 FakeVRDevice::FakeVRDevice() {
-  device_ = mojom::VRDisplayInfo::New();
+  display_info_ = mojom::VRDisplayInfo::New();
 
   InitBasicDevice();
 }
 
 FakeVRDevice::~FakeVRDevice() {}
 
 void FakeVRDevice::InitBasicDevice() {
-  device_->index = id();
-  device_->displayName = "FakeVRDevice";
+  display_info_->index = id();
+  display_info_->displayName = "FakeVRDevice";
 
-  device_->capabilities = mojom::VRDisplayCapabilities::New();
-  device_->capabilities->hasOrientation = true;
-  device_->capabilities->hasPosition = false;
-  device_->capabilities->hasExternalDisplay = false;
-  device_->capabilities->canPresent = false;
+  display_info_->capabilities = mojom::VRDisplayCapabilities::New();
+  display_info_->capabilities->hasOrientation = true;
+  display_info_->capabilities->hasPosition = false;
+  display_info_->capabilities->hasExternalDisplay = false;
+  display_info_->capabilities->canPresent = false;
 
-  device_->leftEye = InitEye(45, -0.03f, 1024);
-  device_->rightEye = InitEye(45, 0.03f, 1024);
+  display_info_->leftEye = InitEye(45, -0.03f, 1024);
+  display_info_->rightEye = InitEye(45, 0.03f, 1024);
 }
 
 mojom::VREyeParametersPtr FakeVRDevice::InitEye(float fov,
                                                 float offset,
                                                 uint32_t size) {
   mojom::VREyeParametersPtr eye = mojom::VREyeParameters::New();
 
   eye->fieldOfView = mojom::VRFieldOfView::New();
   eye->fieldOfView->upDegrees = fov;
   eye->fieldOfView->downDegrees = fov;
   eye->fieldOfView->leftDegrees = fov;
   eye->fieldOfView->rightDegrees = fov;
 
   eye->offset.resize(3);
   eye->offset[0] = offset;
   eye->offset[1] = 0.0f;
   eye->offset[2] = 0.0f;
 
   eye->renderWidth = size;
   eye->renderHeight = size;
 
   return eye;
 }
 
 void FakeVRDevice::SetVRDevice(const mojom::VRDisplayInfoPtr& device) {

[amp, 2017/03/13 22:26:05]

Any reason not to rename the param here to display_info to be consistent?

[tiborg, 2017/03/13 23:00:58]

Good call! Changed it.

-  device_ = device.Clone();
+  display_info_ = device.Clone();
 }
 
-void FakeVRDevice::GetVRDevice(
-    const base::Callback<void(mojom::VRDisplayInfoPtr)>& callback) {
-  mojom::VRDisplayInfoPtr display = device_.Clone();
-  callback.Run(std::move(display));
+void FakeVRDevice::CreateVRDisplayInfo(
+    const base::Callback<void(mojom::VRDisplayInfoPtr)>& onCreated) {
+  mojom::VRDisplayInfoPtr display = display_info_.Clone();
+  onCreated.Run(std::move(display));
 }
 
 void FakeVRDevice::ResetPose() {}
 
 void FakeVRDevice::RequestPresent(const base::Callback<void(bool)>& callback) {
   callback.Run(true);
 }
 
 void FakeVRDevice::SetSecureOrigin(bool secure_origin) {}
 
 void FakeVRDevice::ExitPresent() {
   OnExitPresent();
 }
 
 void FakeVRDevice::SubmitFrame(mojom::VRPosePtr pose) {}
 
 void FakeVRDevice::UpdateLayerBounds(int16_t frame_index,
                                      mojom::VRLayerBoundsPtr leftBounds,
                                      mojom::VRLayerBoundsPtr rightBounds) {}
 
 void FakeVRDevice::GetVRVSyncProvider(mojom::VRVSyncProviderRequest request) {}
 
 }  // namespace device