| 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 #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, |
| 24 const base::WeakPtr<GvrDelegate>& delegate); |
| 23 ~GvrDevice() override; | 25 ~GvrDevice() override; |
| 24 | 26 |
| 25 // VRDevice | 27 // VRDevice |
| 26 mojom::VRDisplayInfoPtr GetVRDevice() override; | 28 mojom::VRDisplayInfoPtr GetVRDevice() override; |
| 27 mojom::VRPosePtr GetPose(VRServiceImpl* service) override; | 29 mojom::VRPosePtr GetPose(VRServiceImpl* service) override; |
| 28 void ResetPose(VRServiceImpl* service) override; | 30 void ResetPose(VRServiceImpl* service) override; |
| 29 | 31 |
| 30 bool RequestPresent(VRServiceImpl* service, bool secure_origin) override; | 32 bool RequestPresent(VRServiceImpl* service, bool secure_origin) override; |
| 31 void ExitPresent(VRServiceImpl* service) override; | 33 void ExitPresent(VRServiceImpl* service) override; |
| 32 | 34 |
| 33 void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) override; | 35 void SubmitFrame(VRServiceImpl* service, mojom::VRPosePtr pose) override; |
| 34 void UpdateLayerBounds(VRServiceImpl* service, | 36 void UpdateLayerBounds(VRServiceImpl* service, |
| 35 mojom::VRLayerBoundsPtr leftBounds, | 37 mojom::VRLayerBoundsPtr leftBounds, |
| 36 mojom::VRLayerBoundsPtr rightBounds) override; | 38 mojom::VRLayerBoundsPtr rightBounds) override; |
| 37 | 39 |
| 38 void SetDelegate(GvrDelegate* delegate); | 40 void SetDelegate(const base::WeakPtr<GvrDelegate>& delegate); |
| 39 | 41 |
| 40 private: | 42 private: |
| 41 gvr::GvrApi* GetGvrApi(); | 43 gvr::GvrApi* GetGvrApi(); |
| 42 | 44 |
| 43 GvrDelegate* delegate_; | 45 base::WeakPtr<GvrDelegate> delegate_; |
| 44 GvrDeviceProvider* gvr_provider_; | 46 GvrDeviceProvider* gvr_provider_; |
| 45 bool secure_origin_; | 47 bool secure_origin_ = false; |
| 46 uint32_t pose_index_ = 0; | 48 uint32_t pose_index_ = 0; |
| 47 | 49 |
| 48 DISALLOW_COPY_AND_ASSIGN(GvrDevice); | 50 DISALLOW_COPY_AND_ASSIGN(GvrDevice); |
| 49 }; | 51 }; |
| 50 | 52 |
| 51 } // namespace device | 53 } // namespace device |
| 52 | 54 |
| 53 #endif // DEVICE_VR_ANDROID_GVR_DEVICE_H | 55 #endif // DEVICE_VR_ANDROID_GVR_DEVICE_H |
| OLD | NEW |