Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: device/vr/vr_device.h

Issue 2494733002: Reland of mojo VR interface simpified. (Closed)
Patch Set: Fix Werror Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « device/vr/vr_client_dispatcher.h ('k') | device/vr/vr_device.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef DEVICE_VR_VR_DEVICE_H 5 #ifndef DEVICE_VR_VR_DEVICE_H
6 #define DEVICE_VR_VR_DEVICE_H 6 #define DEVICE_VR_VR_DEVICE_H
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "device/vr/vr_export.h" 9 #include "device/vr/vr_export.h"
10 #include "device/vr/vr_service.mojom.h" 10 #include "device/vr/vr_service.mojom.h"
11 11
12 namespace blink { 12 namespace blink {
13 struct WebHMDSensorState; 13 struct WebHMDSensorState;
14 } 14 }
15 15
16 namespace ui { 16 namespace ui {
17 class BaseWindow; 17 class BaseWindow;
18 } 18 }
19 19
20 namespace device { 20 namespace device {
21 21
22 class VRDeviceProvider; 22 class VRDeviceProvider;
23 class VRDisplayImpl;
24 class VRServiceImpl;
23 25
24 const unsigned int VR_DEVICE_LAST_ID = 0xFFFFFFFF; 26 const unsigned int VR_DEVICE_LAST_ID = 0xFFFFFFFF;
25 27
26 class DEVICE_VR_EXPORT VRDevice { 28 class DEVICE_VR_EXPORT VRDevice {
27 public: 29 public:
28 explicit VRDevice(VRDeviceProvider* provider); 30 explicit VRDevice(VRDeviceProvider* provider);
29 virtual ~VRDevice(); 31 virtual ~VRDevice();
30 32
31 VRDeviceProvider* provider() const { return provider_; } 33 VRDeviceProvider* provider() const { return provider_; }
32 unsigned int id() const { return id_; } 34 unsigned int id() const { return id_; }
33 35
34 virtual VRDisplayPtr GetVRDevice() = 0; 36 virtual mojom::VRDisplayInfoPtr GetVRDevice() = 0;
35 virtual VRPosePtr GetPose() = 0; 37 virtual mojom::VRPosePtr GetPose(VRServiceImpl* service) = 0;
36 virtual void ResetPose() = 0; 38 virtual void ResetPose(VRServiceImpl* service) = 0;
37 39
38 virtual bool RequestPresent(bool secure_origin); 40 virtual bool RequestPresent(VRServiceImpl* service, bool secure_origin) = 0;
39 virtual void ExitPresent(){}; 41 virtual void ExitPresent(VRServiceImpl* service) = 0;
40 virtual void SubmitFrame(VRPosePtr pose){}; 42 virtual void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) = 0;
41 virtual void UpdateLayerBounds(VRLayerBoundsPtr leftBounds, 43 virtual void UpdateLayerBounds(VRServiceImpl* service,
42 VRLayerBoundsPtr rightBounds){}; 44 mojom::VRLayerBoundsPtr leftBounds,
45 mojom::VRLayerBoundsPtr rightBounds) = 0;
46
47 virtual void AddService(VRServiceImpl* service);
48 virtual void RemoveService(VRServiceImpl* service);
49
50 // TODO(shaobo.yan@intel.com): Checks should be done against VRDisplayImpl and
51 // the name should be considered.
52 virtual bool IsAccessAllowed(VRServiceImpl* service);
53 virtual bool IsPresentingService(VRServiceImpl* service);
54
55 virtual void OnDisplayChanged();
56 virtual void OnExitPresent(VRServiceImpl* service);
57
58 protected:
59 // Each Service have one VRDisplay with one VRDevice.
60 // TODO(shaobo.yan@intel.com): Since the VRDisplayImpl knows its VRServiceImpl
61 // we should
62 // only need to store the VRDisplayImpl.
63 using DisplayClientMap = std::map<VRServiceImpl*, VRDisplayImpl*>;
64 DisplayClientMap displays_;
65
66 // TODO(shaobo.yan@intel.com): Should track presenting VRDisplayImpl instead.
67 VRServiceImpl* presenting_service_;
43 68
44 private: 69 private:
45 VRDeviceProvider* provider_; 70 VRDeviceProvider* provider_;
46 unsigned int id_; 71 unsigned int id_;
47 72
48 static unsigned int next_id_; 73 static unsigned int next_id_;
49 74
50 DISALLOW_COPY_AND_ASSIGN(VRDevice); 75 DISALLOW_COPY_AND_ASSIGN(VRDevice);
51 }; 76 };
52 77
53 } // namespace device 78 } // namespace device
54 79
55 #endif // DEVICE_VR_VR_DEVICE_H 80 #endif // DEVICE_VR_VR_DEVICE_H
OLDNEW
« no previous file with comments | « device/vr/vr_client_dispatcher.h ('k') | device/vr/vr_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698