Move secondary view support into a pref

pcwalton · Jul 28, 2020 · 9fe70e6 · 9fe70e6
1 parent fe24fc3
commit 9fe70e6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
@@ -282,6 +282,7 @@ mod gen {
                     enabled: bool,
                     #[serde(default)]
                     test: bool,
+                    first_person_observer_view: bool,
                     glwindow: {
                         #[serde(default)]
                         enabled: bool,

diff --git a/components/script/dom/xrsystem.rs b/components/script/dom/xrsystem.rs
@@ -26,6 +26,7 @@ use ipc_channel::ipc::{self as ipc_crate, IpcReceiver};
 use ipc_channel::router::ROUTER;
 use msg::constellation_msg::PipelineId;
 use profile_traits::ipc;
+use servo_config::pref;
 use std::cell::Cell;
 use std::rc::Rc;
 use webxr_api::{Error as XRError, Frame, Session, SessionInit, SessionMode};
@@ -215,6 +216,7 @@ impl XRSystemMethods for XRSystem {
         let init = SessionInit {
             required_features,
             optional_features,
+            first_person_observer_view: pref!(dom.webxr.first_person_observer_view),
         };
 
         let mut trusted = Some(TrustedPromise::new(promise.clone()));

diff --git a/ports/libsimpleservo/api/src/lib.rs b/ports/libsimpleservo/api/src/lib.rs
@@ -843,7 +843,7 @@ impl EmbedderMethods for ServoEmbedderCallbacks {
             }
         }
 
-        if openxr::create_instance(false).is_ok() {
+        if openxr::create_instance(false, false).is_ok() {
             let discovery =
                 openxr::OpenXrDiscovery::new(Box::new(ContextMenuCallback(embedder_proxy)));
             registry.register(discovery);

diff --git a/resources/prefs.json b/resources/prefs.json
@@ -40,6 +40,7 @@
   "dom.webvr.test": false,
   "dom.webvtt.enabled": false,
   "dom.webxr.enabled": true,
+  "dom.webxr.first_person_observer_view": false,
   "dom.webxr.glwindow.cubemap": false,
   "dom.webxr.glwindow.enabled": true,
   "dom.webxr.glwindow.left-right": false,