aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xrtest.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/xrtest.rs')
-rw-r--r--components/script/dom/xrtest.rs19
1 files changed, 4 insertions, 15 deletions
diff --git a/components/script/dom/xrtest.rs b/components/script/dom/xrtest.rs
index 05d608b46a4..b00a69b8fca 100644
--- a/components/script/dom/xrtest.rs
+++ b/components/script/dom/xrtest.rs
@@ -21,18 +21,15 @@ use crate::dom::promise::Promise;
use crate::script_thread::ScriptThread;
use crate::task_source::TaskSource;
use dom_struct::dom_struct;
-use euclid::RigidTransform3D;
use ipc_channel::ipc::IpcSender;
use ipc_channel::router::ROUTER;
use profile_traits::ipc;
-use std::cell::Cell;
use std::rc::Rc;
use webxr_api::{self, Error as XRError, MockDeviceInit, MockDeviceMsg};
#[dom_struct]
pub struct XRTest {
reflector: Reflector,
- session_started: Cell<bool>,
devices_connected: DomRefCell<Vec<Dom<FakeXRDevice>>>,
}
@@ -40,7 +37,6 @@ impl XRTest {
pub fn new_inherited() -> XRTest {
XRTest {
reflector: Reflector::new(),
- session_started: Cell::new(false),
devices_connected: DomRefCell::new(vec![]),
}
}
@@ -76,33 +72,28 @@ impl XRTestMethods for XRTest {
fn SimulateDeviceConnection(&self, init: &FakeXRDeviceInit) -> Rc<Promise> {
let p = Promise::new(&self.global());
- if !init.supportsImmersive || self.session_started.get() {
- p.reject_native(&());
- return p;
- }
-
let origin = if let Some(ref o) = init.viewerOrigin {
match get_origin(&o) {
- Ok(origin) => origin,
+ Ok(origin) => Some(origin),
Err(e) => {
p.reject_error(e);
return p;
},
}
} else {
- RigidTransform3D::identity()
+ None
};
let floor_origin = if let Some(ref o) = init.floorOrigin {
match get_origin(&o) {
- Ok(origin) => origin,
+ Ok(origin) => Some(origin),
Err(e) => {
p.reject_error(e);
return p;
},
}
} else {
- RigidTransform3D::identity()
+ None
};
let views = match get_views(&init.views) {
@@ -121,8 +112,6 @@ impl XRTestMethods for XRTest {
floor_origin,
};
- self.session_started.set(true);
-
let global = self.global();
let window = global.as_window();
let this = Trusted::new(self);