aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xr.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2020-02-15 07:59:39 -0500
committerGitHub <noreply@github.com>2020-02-15 07:59:39 -0500
commit3475790fc23f939560f546901bf3082ebf20508a (patch)
tree3ee9b720faf6bfc2dddf8771e2ea40200c47c483 /components/script/dom/xr.rs
parent795dab71fffe98434308732e4cb8ee682f28e465 (diff)
parent54c8cac1cd4bec197b42b3a15304fac81d0e2c30 (diff)
downloadservo-3475790fc23f939560f546901bf3082ebf20508a.tar.gz
servo-3475790fc23f939560f546901bf3082ebf20508a.zip
Auto merge of #25770 - Manishearth:sessionsupport, r=jdm
supportsSession() -> isSessionSupported() r? @jdm fixes https://github.com/servo/servo/issues/25596
Diffstat (limited to 'components/script/dom/xr.rs')
-rw-r--r--components/script/dom/xr.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/components/script/dom/xr.rs b/components/script/dom/xr.rs
index 00f86203b26..2356083687f 100644
--- a/components/script/dom/xr.rs
+++ b/components/script/dom/xr.rs
@@ -113,8 +113,8 @@ impl Into<SessionMode> for XRSessionMode {
}
impl XRMethods for XR {
- /// https://immersive-web.github.io/webxr/#dom-xr-supportssessionmode
- fn SupportsSession(&self, mode: XRSessionMode) -> Rc<Promise> {
+ /// https://immersive-web.github.io/webxr/#dom-xr-issessionsupported
+ fn IsSessionSupported(&self, mode: XRSessionMode) -> Rc<Promise> {
// XXXManishearth this should select an XR device first
let promise = Promise::new(&self.global());
let mut trusted = Some(TrustedPromise::new(promise.clone()));
@@ -141,10 +141,11 @@ impl XRMethods for XR {
return;
};
if let Ok(()) = message {
- let _ = task_source.queue_with_canceller(trusted.resolve_task(()), &canceller);
+ let _ =
+ task_source.queue_with_canceller(trusted.resolve_task(true), &canceller);
} else {
- let _ = task_source
- .queue_with_canceller(trusted.reject_task(Error::NotSupported), &canceller);
+ let _ =
+ task_source.queue_with_canceller(trusted.resolve_task(false), &canceller);
};
}),
);