Auto merge of #25770 - Manishearth:sessionsupport, r=jdm

supportsSession() -> isSessionSupported()

r? @jdm

fixes https://github.com/servo/servo/issues/25596

2 files changed, 7 insertions, 6 deletions

diff --git a/components/script/dom/webidls/XR.webidl b/components/script/dom/webidls/XR.webidl
index 8b0311f0c3f..1c1e880eab2 100644
--- a/components/script/dom/webidls/XR.webidl
+++ b/components/script/dom/webidls/XR.webidl
@@ -6,7 +6,7 @@
 [SecureContext, Exposed=Window, Pref="dom.webxr.enabled"]
 interface XR: EventTarget {
   // Methods
-  Promise<void> supportsSession(XRSessionMode mode);
+  Promise<boolean> isSessionSupported(XRSessionMode mode);
   Promise<XRSession> requestSession(XRSessionMode mode, optional  XRSessionInit parameters = {});
 
   // Events
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);
                 };
             }),
         );