Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-30 10:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
supportsSession() -> isSessionSupported()

r? @jdm

fixes https://github.com/servo/servo/issues/25596
This commit is contained in:
bors-servo 2020-02-15 07:59:39 -05:00 • committed by GitHub
commit 3475790fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/webidls/XR.webidl
View file

@ -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

11
components/script/dom/xr.rs
View file

@ -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);
};
}),
);