aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2019-07-31 13:24:28 -0700
committerManish Goregaokar <manishsmail@gmail.com>2019-07-31 13:24:28 -0700
commit5ab40e991e2e5d7495d6561a064c559ee57775bd (patch)
tree8ba5ceb015d489e1279114ce63a6f812eca3703c
parent174bcc443435100da31b20db5ab684f4f3c8255b (diff)
downloadservo-5ab40e991e2e5d7495d6561a064c559ee57775bd.tar.gz
servo-5ab40e991e2e5d7495d6561a064c559ee57775bd.zip
Do not start up webvr services when running webxr and vice versa
-rw-r--r--components/servo/lib.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 75a8706ef71..9b4f108649b 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -381,16 +381,20 @@ where
// can't defer it after `create_constellation` has started.
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,
// but we are migrating over to just using webxr.
let mut webxr_main_thread = webxr_api::MainThreadRegistry::new(event_loop_waker)
.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);
}
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();
services.register_defaults();
embedder.register_vr_services(&mut services, &mut webvr_heartbeats);