Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not start up webvr services when running webxr and vice versa

Browse source
This commit is contained in:
Manish Goregaokar 2019-07-31 13:24:28 -07:00
parent 174bcc4434
commit 5ab40e991e
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/servo/lib.rs
View file

@ -381,16 +381,20 @@ where
// can't defer it after `create_constellation` has started. // can't defer it after `create_constellation` has started.
script::init(); script::init();
if pref!(dom.webxr.enabled) && pref!(dom.webvr.enabled) {
panic!("We don't currently support running both WebVR and WebXR");
}
// For the moment, we enable use both the webxr crate and the rust-webvr crate, // For the moment, we enable use both the webxr crate and the rust-webvr crate,
// but we are migrating over to just using webxr. // but we are migrating over to just using webxr.
let mut webxr_main_thread = webxr_api::MainThreadRegistry::new(event_loop_waker) let mut webxr_main_thread = webxr_api::MainThreadRegistry::new(event_loop_waker)
.expect("Failed to create WebXR device registry"); .expect("Failed to create WebXR device registry");
if pref!(dom.webvr.enabled) || pref!(dom.webxr.enabled) { if pref!(dom.webxr.enabled) {
embedder.register_webxr(&mut webxr_main_thread); embedder.register_webxr(&mut webxr_main_thread);
} }
let mut webvr_heartbeats = Vec::new(); let mut webvr_heartbeats = Vec::new();
let webvr_services = if pref!(dom.webvr.enabled) || pref!(dom.webxr.enabled) { let webvr_services = if pref!(dom.webvr.enabled) {
let mut services = VRServiceManager::new(); let mut services = VRServiceManager::new();
services.register_defaults(); services.register_defaults();
embedder.register_vr_services(&mut services, &mut webvr_heartbeats); embedder.register_vr_services(&mut services, &mut webvr_heartbeats);