diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/device/vr/vr_device_base.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/device/vr/vr_device_base.cc')
-rw-r--r-- | chromium/device/vr/vr_device_base.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chromium/device/vr/vr_device_base.cc b/chromium/device/vr/vr_device_base.cc index 61a6404614c..9d113bb653d 100644 --- a/chromium/device/vr/vr_device_base.cc +++ b/chromium/device/vr/vr_device_base.cc @@ -19,6 +19,10 @@ mojom::XRDeviceId VRDeviceBase::GetId() const { return id_; } +mojom::XRDeviceDataPtr VRDeviceBase::GetDeviceData() const { + return device_data_.Clone(); +} + void VRDeviceBase::PauseTracking() {} void VRDeviceBase::ResumeTracking() {} @@ -75,6 +79,15 @@ void VRDeviceBase::OnVisibilityStateChanged( listener_->OnVisibilityStateChanged(visibility_state); } +#if defined(OS_WIN) +void VRDeviceBase::SetLuid(const LUID& luid) { + if (luid.HighPart != 0 || luid.LowPart != 0) { + // Only set the LUID if it exists and is nonzero. + device_data_.luid = base::make_optional<LUID>(luid); + } +} +#endif + mojo::PendingRemote<mojom::XRRuntime> VRDeviceBase::BindXRRuntime() { DVLOG(2) << __func__; return runtime_receiver_.BindNewPipeAndPassRemote(); |