mojo VR interface simplified

device/vr/vr_service_impl.cc

Index: device/vr/vr_service_impl.cc
diff --git a/device/vr/vr_service_impl.cc b/device/vr/vr_service_impl.cc
index 6ea486de284d4d5e0e37bb7a7a36adb172b41a6b..0cefbfbc66f1f8ab779c93e016fb11915c115f5e 100644
--- a/device/vr/vr_service_impl.cc
+++ b/device/vr/vr_service_impl.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "device/vr/vr_device.h"
 #include "device/vr/vr_device_manager.h"
+#include "device/vr/vr_device_service_impl.h"
 
 namespace device {
 
@@ -21,6 +22,8 @@ VRServiceImpl::~VRServiceImpl() {
 void VRServiceImpl::BindRequest(mojo::InterfaceRequest<VRService> request) {
   VRServiceImpl* service = new VRServiceImpl();
   service->Bind(std::move(request));
+  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
+  device_manager->AddService(service);
 }
 
 void VRServiceImpl::Bind(mojo::InterfaceRequest<VRService> request) {
@@ -30,62 +33,32 @@ void VRServiceImpl::Bind(mojo::InterfaceRequest<VRService> request) {
 }
 
 void VRServiceImpl::RemoveFromDeviceManager() {
+  device_service_impl_.clear();
+  device_services_.clear();
   VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
   device_manager->RemoveService(this);
 }
 
-void VRServiceImpl::SetClient(VRServiceClientPtr client) {
-  DCHECK(!client_.get());
-
-  client_ = std::move(client);
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  device_manager->AddService(this);
+void VRServiceImpl::RemoveDeviceServiceImpl(VRDevice* device) {
+  device_service_impl_.erase(device);
+  device_services_.erase(device);
 }
 
-void VRServiceImpl::GetDisplays(const GetDisplaysCallback& callback) {
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  callback.Run(device_manager->GetVRDevices());
-}
-
-void VRServiceImpl::GetPose(uint32_t index, const GetPoseCallback& callback) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
+VRDeviceServicePtr VRServiceImpl::GetDeviceServicePtr(VRDevice* device) {
+  if (device_service_impl_.find(device) == device_service_impl_.end()) {
+    VRDeviceServicePtr deviceService;
 
-  if (device) {
-    callback.Run(device->GetPose());
-  } else {
-    callback.Run(nullptr);
+    device_service_impl_[device] = std::unique_ptr<VRDeviceServiceImpl>(
+        new VRDeviceServiceImpl(GetProxy(&deviceService), device, this));
+    device_services_[device] = std::move(deviceService);
   }
-}
 
-void VRServiceImpl::ResetPose(uint32_t index) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
-  if (device)
-    device->ResetPose();
+  return std::move(device_services_[device]);

[leonhsl(Using Gerrit), 2016/10/17 09:03:29]

After std::move(), device_services_[device] became invalid and can not be
referred anymore.

[shaobo.yan, 2016/10/18 01:10:48]

I'm so stupid. Thx for finding this. I'll update the logic and not referred to
deviceService any more.

 }
 
-void VRServiceImpl::RequestPresent(uint32_t index,
-                                   bool secureOrigin,
-                                   const RequestPresentCallback& callback) {
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  callback.Run(device_manager->RequestPresent(this, index, secureOrigin));
-}
-
-void VRServiceImpl::ExitPresent(uint32_t index) {
-  VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  device_manager->ExitPresent(this, index);
-}
-
-void VRServiceImpl::SubmitFrame(uint32_t index, VRPosePtr pose) {
+void VRServiceImpl::GetDisplays(const GetDisplaysCallback& callback) {
   VRDeviceManager* device_manager = VRDeviceManager::GetInstance();
-  device_manager->SubmitFrame(this, index, std::move(pose));
-}
-
-void VRServiceImpl::UpdateLayerBounds(uint32_t index,
-                                      VRLayerBoundsPtr leftBounds,
-                                      VRLayerBoundsPtr rightBounds) {
-  VRDevice* device = VRDeviceManager::GetAllowedDevice(this, index);
-  if (device)
-    device->UpdateLayerBounds(std::move(leftBounds), std::move(rightBounds));
+  callback.Run(device_manager->GetVRDevices(this));
 }
 
 }  // namespace device