| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "device/vr/vr_device.h" | 8 #include "device/vr/vr_device.h" |
| 9 #include "device/vr/vr_service_impl.h" | 9 #include "device/vr/vr_service_impl.h" |
| 10 | 10 |
| 11 namespace device { | 11 namespace device { |
| 12 | 12 |
| 13 VRDisplayImpl::VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service) | 13 VRDisplayImpl::VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service) |
| 14 : binding_(this), | 14 : binding_(this), |
| 15 device_(device), | 15 device_(device), |
| 16 service_(service), | 16 service_(service), |
| 17 weak_ptr_factory_(this) { | 17 weak_ptr_factory_(this) { |
| 18 mojom::VRDisplayInfoPtr display_info = device->GetVRDevice(); | 18 mojom::VRDisplayInfoPtr display_info = device->GetVRDevice(); |
| 19 if (service->client()) { | 19 if (service->client()) { |
| 20 service->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(), | 20 service->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(), |
| 21 mojo::GetProxy(&client_), | 21 mojo::GetProxy(&client_), |
| 22 std::move(display_info)); | 22 std::move(display_info)); |
| 23 } | 23 } |
| 24 } | 24 } |
| 25 | 25 |
| 26 VRDisplayImpl::~VRDisplayImpl() {} | 26 VRDisplayImpl::~VRDisplayImpl() { |
| 27 device_->RemoveDisplay(this); |
| 28 } |
| 27 | 29 |
| 28 void VRDisplayImpl::GetPose(const GetPoseCallback& callback) { | 30 void VRDisplayImpl::GetPose(const GetPoseCallback& callback) { |
| 29 if (!device_->IsAccessAllowed(this)) { | 31 if (!device_->IsAccessAllowed(this)) { |
| 30 callback.Run(nullptr); | 32 callback.Run(nullptr); |
| 31 return; | 33 return; |
| 32 } | 34 } |
| 33 | 35 |
| 34 callback.Run(device_->GetPose()); | 36 callback.Run(device_->GetPose()); |
| 35 } | 37 } |
| 36 | 38 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 } | 77 } |
| 76 | 78 |
| 77 void VRDisplayImpl::UpdateLayerBounds(mojom::VRLayerBoundsPtr left_bounds, | 79 void VRDisplayImpl::UpdateLayerBounds(mojom::VRLayerBoundsPtr left_bounds, |
| 78 mojom::VRLayerBoundsPtr right_bounds) { | 80 mojom::VRLayerBoundsPtr right_bounds) { |
| 79 if (!device_->IsAccessAllowed(this)) | 81 if (!device_->IsAccessAllowed(this)) |
| 80 return; | 82 return; |
| 81 | 83 |
| 82 device_->UpdateLayerBounds(std::move(left_bounds), std::move(right_bounds)); | 84 device_->UpdateLayerBounds(std::move(left_bounds), std::move(right_bounds)); |
| 83 } | 85 } |
| 84 } | 86 } |
| OLD | NEW |