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

Side by Side Diff: third_party/WebKit/Source/modules/vr/VRDisplay.h

Issue 2420743003: mojo VR interface simplified (Closed)
Patch Set: Address bajones@ comments and some clean up Created 4 years, 2 months 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
OLDNEW
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 #ifndef VRDisplay_h 5 #ifndef VRDisplay_h
6 #define VRDisplay_h 6 #define VRDisplay_h
7 7
8 #include "bindings/core/v8/ScriptWrappable.h" 8 #include "bindings/core/v8/ScriptWrappable.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/dom/FrameRequestCallback.h" 10 #include "core/dom/FrameRequestCallback.h"
11 #include "device/vr/vr_service.mojom-blink.h" 11 #include "device/vr/vr_service.mojom-blink.h"
12 #include "modules/vr/VRDisplayCapabilities.h" 12 #include "modules/vr/VRDisplayCapabilities.h"
13 #include "modules/vr/VRLayer.h" 13 #include "modules/vr/VRLayer.h"
14 #include "mojo/public/cpp/bindings/binding.h"
14 #include "platform/Timer.h" 15 #include "platform/Timer.h"
15 #include "platform/heap/Handle.h" 16 #include "platform/heap/Handle.h"
16 #include "public/platform/WebGraphicsContext3DProvider.h" 17 #include "public/platform/WebGraphicsContext3DProvider.h"
17 #include "wtf/Forward.h" 18 #include "wtf/Forward.h"
18 #include "wtf/text/WTFString.h" 19 #include "wtf/text/WTFString.h"
19 20
20 namespace gpu { 21 namespace gpu {
21 namespace gles2 { 22 namespace gles2 {
22 class GLES2Interface; 23 class GLES2Interface;
23 } 24 }
24 } 25 }
25 26
26 namespace blink { 27 namespace blink {
27 28
28 class NavigatorVR; 29 class NavigatorVR;
29 class VRController; 30 class VRController;
30 class VREyeParameters; 31 class VREyeParameters;
31 class VRFrameData; 32 class VRFrameData;
32 class VRStageParameters; 33 class VRStageParameters;
33 class VRPose; 34 class VRPose;
34 35
35 class WebGLRenderingContextBase; 36 class WebGLRenderingContextBase;
36 37
37 enum VREye { VREyeNone, VREyeLeft, VREyeRight }; 38 enum VREye { VREyeNone, VREyeLeft, VREyeRight };
38 39
39 class VRDisplay final : public GarbageCollectedFinalized<VRDisplay>, 40 class VRDisplay final : public GarbageCollectedFinalized<VRDisplay>,
41 public device::blink::VRDisplayService,
40 public ScriptWrappable { 42 public ScriptWrappable {
41 DEFINE_WRAPPERTYPEINFO(); 43 DEFINE_WRAPPERTYPEINFO();
44 USING_PRE_FINALIZER(VRDisplay, shutdownMessagePipe);
42 45
43 public: 46 public:
44 ~VRDisplay(); 47 ~VRDisplay();
45 48
46 unsigned displayId() const { return m_displayId; } 49 unsigned displayId() const { return m_displayId; }
47 const String& displayName() const { return m_displayName; } 50 const String& displayName() const { return m_displayName; }
48 51
49 VRDisplayCapabilities* capabilities() const { return m_capabilities; } 52 VRDisplayCapabilities* capabilities() const { return m_capabilities; }
50 VRStageParameters* stageParameters() const { return m_stageParameters; } 53 VRStageParameters* stageParameters() const { return m_stageParameters; }
51 54
52 bool isConnected() const { return m_isConnected; } 55 bool isConnected() const { return m_isConnected; }
53 bool isPresenting() const { return m_isPresenting; } 56 bool isPresenting() const { return m_isPresenting; }
54 57
55 bool getFrameData(VRFrameData*); 58 bool getFrameData(VRFrameData*);
56 VRPose* getPose(); 59 VRPose* getPose();
57 void resetPose(); 60 void resetPose();
58 61
59 double depthNear() const { return m_depthNear; } 62 double depthNear() const { return m_depthNear; }
60 double depthFar() const { return m_depthFar; } 63 double depthFar() const { return m_depthFar; }
61 64
62 void setDepthNear(double value) { m_depthNear = value; } 65 void setDepthNear(double value) { m_depthNear = value; }
63 void setDepthFar(double value) { m_depthFar = value; } 66 void setDepthFar(double value) { m_depthFar = value; }
64 67
68 void setService(device::blink::VRDeviceServicePtr service) {
69 m_service = std::move(service);
70 }
71
65 VREyeParameters* getEyeParameters(const String&); 72 VREyeParameters* getEyeParameters(const String&);
66 73
67 int requestAnimationFrame(FrameRequestCallback*); 74 int requestAnimationFrame(FrameRequestCallback*);
68 void cancelAnimationFrame(int id); 75 void cancelAnimationFrame(int id);
69 76
70 ScriptPromise requestPresent(ScriptState*, const HeapVector<VRLayer>& layers); 77 ScriptPromise requestPresent(ScriptState*, const HeapVector<VRLayer>& layers);
71 ScriptPromise exitPresent(ScriptState*); 78 ScriptPromise exitPresent(ScriptState*);
72 79
73 HeapVector<VRLayer> getLayers(); 80 HeapVector<VRLayer> getLayers();
74 81
(...skipping 13 matching lines...) Expand all
88 void beginPresent(ScriptPromiseResolver*); 95 void beginPresent(ScriptPromiseResolver*);
89 void forceExitPresent(); 96 void forceExitPresent();
90 97
91 void updateLayerBounds(); 98 void updateLayerBounds();
92 void disconnected(); 99 void disconnected();
93 100
94 VRController* controller(); 101 VRController* controller();
95 102
96 private: 103 private:
97 void onFullscreenCheck(TimerBase*); 104 void onFullscreenCheck(TimerBase*);
105 void RegisterDisplayService();
106 void onPresentComplete(ScriptPromiseResolver*, bool);
107
108 // VRDisplayService
109 void OnDisplayChanged(device::blink::VRDisplayPtr) override;
110 void OnExitPresent() override;
111 void OnDisplayConnected(device::blink::VRDisplayPtr) override;
112 void OnDisplayDisconnected() override;
98 113
99 Member<NavigatorVR> m_navigatorVR; 114 Member<NavigatorVR> m_navigatorVR;
100 unsigned m_displayId; 115 unsigned m_displayId;
101 String m_displayName; 116 String m_displayName;
102 bool m_isConnected; 117 bool m_isConnected;
103 bool m_isPresenting; 118 bool m_isPresenting;
104 bool m_canUpdateFramePose; 119 bool m_canUpdateFramePose;
105 unsigned m_compositorHandle; 120 unsigned m_compositorHandle;
106 Member<VRDisplayCapabilities> m_capabilities; 121 Member<VRDisplayCapabilities> m_capabilities;
107 Member<VRStageParameters> m_stageParameters; 122 Member<VRStageParameters> m_stageParameters;
108 Member<VREyeParameters> m_eyeParametersLeft; 123 Member<VREyeParameters> m_eyeParametersLeft;
109 Member<VREyeParameters> m_eyeParametersRight; 124 Member<VREyeParameters> m_eyeParametersRight;
110 device::blink::VRPosePtr m_framePose; 125 device::blink::VRPosePtr m_framePose;
111 VRLayer m_layer; 126 VRLayer m_layer;
112 double m_depthNear; 127 double m_depthNear;
113 double m_depthFar; 128 double m_depthFar;
114 129
130 // Help VRController shutdown message pipe.
131 void shutdownMessagePipe();
132
115 Timer<VRDisplay> m_fullscreenCheckTimer; 133 Timer<VRDisplay> m_fullscreenCheckTimer;
116 gpu::gles2::GLES2Interface* m_contextGL; 134 gpu::gles2::GLES2Interface* m_contextGL;
117 Member<WebGLRenderingContextBase> m_renderingContext; 135 Member<WebGLRenderingContextBase> m_renderingContext;
136
137 device::blink::VRDeviceServicePtr m_service;
138
139 mojo::Binding<device::blink::VRDisplayService> m_binding;
118 }; 140 };
119 141
120 using VRDisplayVector = HeapVector<Member<VRDisplay>>; 142 using VRDisplayVector = HeapVector<Member<VRDisplay>>;
121 143
122 } // namespace blink 144 } // namespace blink
123 145
124 #endif // VRDisplay_h 146 #endif // VRDisplay_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698