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

Side by Side Diff: device/vr/android/gvr/gvr_device.h

Issue 2471433002: Implement WebVR presentation pausing for VR Shell Menu Mode (Closed)
Patch Set: Address Comments 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
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 DEVICE_VR_ANDROID_GVR_DEVICE_H 5 #ifndef DEVICE_VR_ANDROID_GVR_DEVICE_H
6 #define DEVICE_VR_ANDROID_GVR_DEVICE_H 6 #define DEVICE_VR_ANDROID_GVR_DEVICE_H
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h"
9 #include "device/vr/vr_device.h" 10 #include "device/vr/vr_device.h"
10 11
11 namespace gvr { 12 namespace gvr {
12 class GvrApi; 13 class GvrApi;
13 } // namespace gvr 14 } // namespace gvr
14 15
15 namespace device { 16 namespace device {
16 17
17 class GvrDeviceProvider; 18 class GvrDeviceProvider;
18 class GvrDelegate; 19 class GvrDelegate;
19 20
20 class GvrDevice : public VRDevice { 21 class GvrDevice : public VRDevice {
21 public: 22 public:
22 GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate); 23 GvrDevice(GvrDeviceProvider* provider, base::WeakPtr<GvrDelegate> delegate);
dcheng 2016/11/12 02:03:31 Nit: const ref.
mthiesse 2016/11/14 16:41:38 Done.
23 ~GvrDevice() override; 24 ~GvrDevice() override;
24 25
25 // VRDevice 26 // VRDevice
26 mojom::VRDisplayInfoPtr GetVRDevice() override; 27 mojom::VRDisplayInfoPtr GetVRDevice() override;
27 mojom::VRPosePtr GetPose(VRServiceImpl* service) override; 28 mojom::VRPosePtr GetPose(VRServiceImpl* service) override;
28 void ResetPose(VRServiceImpl* service) override; 29 void ResetPose(VRServiceImpl* service) override;
29 30
30 bool RequestPresent(VRServiceImpl* service, bool secure_origin) override; 31 bool RequestPresent(VRServiceImpl* service, bool secure_origin) override;
31 void ExitPresent(VRServiceImpl* service) override; 32 void ExitPresent(VRServiceImpl* service) override;
32 33
33 void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) override; 34 void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) override;
34 void UpdateLayerBounds(VRServiceImpl* service, 35 void UpdateLayerBounds(VRServiceImpl* service,
35 mojom::VRLayerBoundsPtr leftBounds, 36 mojom::VRLayerBoundsPtr leftBounds,
36 mojom::VRLayerBoundsPtr rightBounds) override; 37 mojom::VRLayerBoundsPtr rightBounds) override;
37 38
38 void SetDelegate(GvrDelegate* delegate); 39 void SetDelegate(base::WeakPtr<GvrDelegate> delegate);
dcheng 2016/11/12 02:03:31 Ditto.
mthiesse 2016/11/14 16:41:38 Done.
39 40
40 private: 41 private:
41 gvr::GvrApi* GetGvrApi(); 42 gvr::GvrApi* GetGvrApi();
42 43
43 GvrDelegate* delegate_; 44 base::WeakPtr<GvrDelegate> delegate_;
44 GvrDeviceProvider* gvr_provider_; 45 GvrDeviceProvider* gvr_provider_;
45 bool secure_origin_; 46 bool secure_origin_ = false;
46 uint32_t pose_index_ = 0; 47 uint32_t pose_index_ = 0;
47 48
48 DISALLOW_COPY_AND_ASSIGN(GvrDevice); 49 DISALLOW_COPY_AND_ASSIGN(GvrDevice);
49 }; 50 };
50 51
51 } // namespace device 52 } // namespace device
52 53
53 #endif // DEVICE_VR_ANDROID_GVR_DEVICE_H 54 #endif // DEVICE_VR_ANDROID_GVR_DEVICE_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698