Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update xr.requestSession() arguments

Browse source
This commit is contained in:
Manish Goregaokar 2019-07-16 15:22:00 -07:00
parent 73f1bdac06
commit df1f865cb2
5 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,8 +6,8 @@
[SecureContext, Exposed=Window, Pref="dom.webxr.enabled"] [SecureContext, Exposed=Window, Pref="dom.webxr.enabled"]
interface XR: EventTarget { interface XR: EventTarget {
// Methods // Methods
Promise<void> supportsSessionMode(XRSessionMode mode); Promise<void> supportsSession(XRSessionMode mode);
Promise<XRSession> requestSession(optional XRSessionCreationOptions parameters = {}); Promise<XRSession> requestSession(XRSessionMode mode, optional XRSessionInit parameters = {});
// Events // Events
// attribute EventHandler ondevicechange; // attribute EventHandler ondevicechange;
@ -24,9 +24,9 @@ enum XRSessionMode {
"immersive-ar" "immersive-ar"
}; };
dictionary XRSessionCreationOptions { dictionary XRSessionInit {
XRSessionMode mode = "inline"; sequence<DOMString> requiredFeatures;
// XRPresentationContext outputContext; sequence<DOMString> optionalFeatures;
}; };
partial interface XR { partial interface XR {

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

@ -6,7 +6,7 @@ use crate::compartments::InCompartment;
use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::VRDisplayBinding::VRDisplayMethods; use crate::dom::bindings::codegen::Bindings::VRDisplayBinding::VRDisplayMethods;
use crate::dom::bindings::codegen::Bindings::XRBinding; use crate::dom::bindings::codegen::Bindings::XRBinding;
use crate::dom::bindings::codegen::Bindings::XRBinding::XRSessionCreationOptions; use crate::dom::bindings::codegen::Bindings::XRBinding::XRSessionInit;
use crate::dom::bindings::codegen::Bindings::XRBinding::{XRMethods, XRSessionMode}; use crate::dom::bindings::codegen::Bindings::XRBinding::{XRMethods, XRSessionMode};
use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Error;
use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::inheritance::Castable;
@ -96,7 +96,7 @@ impl Into<SessionMode> for XRSessionMode {
impl XRMethods for XR { impl XRMethods for XR {
/// https://immersive-web.github.io/webxr/#dom-xr-supportssessionmode /// https://immersive-web.github.io/webxr/#dom-xr-supportssessionmode
fn SupportsSessionMode(&self, mode: XRSessionMode, comp: InCompartment) -> Rc<Promise> { fn SupportsSession(&self, mode: XRSessionMode) -> Rc<Promise> {
#[derive(serde::Serialize, serde::Deserialize)] #[derive(serde::Serialize, serde::Deserialize)]
pub struct SupportsSession { pub struct SupportsSession {
sender: IpcSender<bool>, sender: IpcSender<bool>,
@ -110,7 +110,7 @@ impl XRMethods for XR {
} }
// XXXManishearth this should select an XR device first // XXXManishearth this should select an XR device first
let promise = Promise::new_in_current_compartment(&self.global(), comp); let promise = Promise::new(&self.global());
let mut trusted = Some(TrustedPromise::new(promise.clone())); let mut trusted = Some(TrustedPromise::new(promise.clone()));
let global = self.global(); let global = self.global();
let window = global.as_window(); let window = global.as_window();
@ -152,7 +152,8 @@ impl XRMethods for XR {
/// https://immersive-web.github.io/webxr/#dom-xr-requestsession /// https://immersive-web.github.io/webxr/#dom-xr-requestsession
fn RequestSession( fn RequestSession(
&self, &self,
options: &XRSessionCreationOptions, mode: XRSessionMode,
_: &XRSessionInit,
comp: InCompartment, comp: InCompartment,
) -> Rc<Promise> { ) -> Rc<Promise> {
#[derive(serde::Serialize, serde::Deserialize)] #[derive(serde::Serialize, serde::Deserialize)]
@ -167,7 +168,7 @@ impl XRMethods for XR {
} }
} }
let promise = Promise::new_in_current_compartment(&self.global(), comp); let promise = Promise::new_in_current_compartment(&self.global(), comp);
if options.mode != XRSessionMode::Immersive_vr { if mode != XRSessionMode::Immersive_vr {
promise.reject_error(Error::NotSupported); promise.reject_error(Error::NotSupported);
return promise; return promise;
} }
@ -210,7 +211,7 @@ impl XRMethods for XR {
); );
window window
.webxr_registry() .webxr_registry()
.request_session(options.mode.into(), RequestSession { sender }); .request_session(mode.into(), RequestSession { sender });
promise promise
} }

4
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -19690,11 +19690,11 @@
"testharness" "testharness"
], ],
"webxr/create_session.html": [ "webxr/create_session.html": [
"ddec5add27b84e8e2febe3789d326f1e9fb7f508", "e68ea81893a65793094f9086cdd6d73800ee1c14",
"testharness" "testharness"
], ],
"webxr/obtain_frame.html": [ "webxr/obtain_frame.html": [
"063008c7ebc0df9997b8286296b4f7fe4663b331", "39698805b476c7e469548d25ece59560a596604d",
"testharness" "testharness"
], ],
"webxr/resources/webxr-util.js": [ "webxr/resources/webxr-util.js": [

2
tests/wpt/mozilla/tests/webxr/create_session.html
View file

@ -12,7 +12,7 @@
views: TEST_VIEWS, views: TEST_VIEWS,
viewerOrigin: {position: [0.5, 0.1, 0.1], orientation: [1, 0, 0, 1] } viewerOrigin: {position: [0.5, 0.1, 0.1], orientation: [1, 0, 0, 1] }
}).then((m) => { }).then((m) => {
return navigator.xr.requestSession({mode: "immersive-vr"}) return navigator.xr.requestSession("immersive-vr")
}).then(() => t.done()); }).then(() => t.done());
}); });
</script> </script>

2
tests/wpt/mozilla/tests/webxr/obtain_frame.html
View file

@ -16,7 +16,7 @@
views: TEST_VIEWS, views: TEST_VIEWS,
viewerOrigin: {position: [0.5, 0.1, 0.1], orientation: [1, 0, 0, 1] } viewerOrigin: {position: [0.5, 0.1, 0.1], orientation: [1, 0, 0, 1] }
}); });
let session = await navigator.xr.requestSession({mode: "immersive-vr"}); let session = await navigator.xr.requestSession("immersive-vr");
await session.updateRenderState({"baseLayer": new XRWebGLLayer(session, gl, {})}); await session.updateRenderState({"baseLayer": new XRWebGLLayer(session, gl, {})});
let resolve; let resolve;