From 638cc92e89e05806f69e620bf2f89772715bb1f7 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 19 Jul 2019 16:02:11 -0700 Subject: [PATCH] Add XRSessionEvent --- components/script/dom/mod.rs | 1 + .../script/dom/webidls/XRSessionEvent.webidl | 15 ++++ components/script/dom/xrsessionevent.rs | 78 +++++++++++++++++++ .../webxr/idlharness.https.window.js.ini | 21 ----- 4 files changed, 94 insertions(+), 21 deletions(-) create mode 100644 components/script/dom/webidls/XRSessionEvent.webidl create mode 100644 components/script/dom/xrsessionevent.rs diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 0a654f93c57..60701755ec8 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -552,6 +552,7 @@ pub mod xrreferencespace; pub mod xrrenderstate; pub mod xrrigidtransform; pub mod xrsession; +pub mod xrsessionevent; pub mod xrspace; pub mod xrtest; pub mod xrview; diff --git a/components/script/dom/webidls/XRSessionEvent.webidl b/components/script/dom/webidls/XRSessionEvent.webidl new file mode 100644 index 00000000000..f48fa5eb342 --- /dev/null +++ b/components/script/dom/webidls/XRSessionEvent.webidl @@ -0,0 +1,15 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +// https://immersive-web.github.io/webxr/#xrsessionevent-interface + +[SecureContext, Exposed=Window, Pref="dom.webxr.enabled", Constructor +(DOMString type, XRSessionEventInit eventInitDict)] +interface XRSessionEvent : Event { + [SameObject] readonly attribute XRSession session; +}; + +dictionary XRSessionEventInit : EventInit { + required XRSession session; +}; diff --git a/components/script/dom/xrsessionevent.rs b/components/script/dom/xrsessionevent.rs new file mode 100644 index 00000000000..6c2e8c0fb00 --- /dev/null +++ b/components/script/dom/xrsessionevent.rs @@ -0,0 +1,78 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +use crate::dom::bindings::codegen::Bindings::EventBinding::EventBinding::EventMethods; +use crate::dom::bindings::codegen::Bindings::XRSessionEventBinding::{self, XRSessionEventMethods}; +use crate::dom::bindings::error::Fallible; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::reflector::{reflect_dom_object, DomObject}; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::str::DOMString; +use crate::dom::event::Event; +use crate::dom::globalscope::GlobalScope; +use crate::dom::window::Window; +use crate::dom::xrsession::XRSession; +use dom_struct::dom_struct; +use servo_atoms::Atom; + +#[dom_struct] +pub struct XRSessionEvent { + event: Event, + session: Dom, +} + +impl XRSessionEvent { + #[allow(unrooted_must_root)] + fn new_inherited(session: &XRSession) -> XRSessionEvent { + XRSessionEvent { + event: Event::new_inherited(), + session: Dom::from_ref(session), + } + } + + pub fn new( + global: &GlobalScope, + type_: Atom, + bubbles: bool, + cancelable: bool, + session: &XRSession, + ) -> DomRoot { + let trackevent = reflect_dom_object( + Box::new(XRSessionEvent::new_inherited(&session)), + global, + XRSessionEventBinding::Wrap, + ); + { + let event = trackevent.upcast::(); + event.init_event(type_, bubbles, cancelable); + } + trackevent + } + + pub fn Constructor( + window: &Window, + type_: DOMString, + init: &XRSessionEventBinding::XRSessionEventInit, + ) -> Fallible> { + Ok(XRSessionEvent::new( + &window.global(), + Atom::from(type_), + init.parent.bubbles, + init.parent.cancelable, + &init.session, + )) + } +} + +impl XRSessionEventMethods for XRSessionEvent { + // https://immersive-web.github.io/webxr/#dom-xrsessioneventinit-session + fn Session(&self) -> DomRoot { + DomRoot::from_ref(&*self.session) + } + + // https://dom.spec.whatwg.org/#dom-event-istrusted + fn IsTrusted(&self) -> bool { + self.event.IsTrusted() + } +} diff --git a/tests/wpt/metadata/webxr/idlharness.https.window.js.ini b/tests/wpt/metadata/webxr/idlharness.https.window.js.ini index b3906bc63f5..f49d52ccf2e 100644 --- a/tests/wpt/metadata/webxr/idlharness.https.window.js.ini +++ b/tests/wpt/metadata/webxr/idlharness.https.window.js.ini @@ -44,18 +44,12 @@ [XRInputSourceArray interface: attribute length] expected: FAIL - [XRSessionEvent interface: existence and properties of interface object] - expected: FAIL - [XRInputSource interface: attribute targetRayMode] expected: FAIL [XRBoundedReferenceSpace interface object length] expected: FAIL - [XRSessionEvent interface object length] - expected: FAIL - [XRWebGLLayer interface: operation getNativeFramebufferScaleFactor(XRSession)] expected: FAIL @@ -74,18 +68,12 @@ [XRReferenceSpaceEvent interface object length] expected: FAIL - [XRSessionEvent interface: existence and properties of interface prototype object's @@unscopables property] - expected: FAIL - [WebGLRenderingContext interface: operation makeXRCompatible()] expected: FAIL [XRInputSourcesChangeEvent interface: attribute added] expected: FAIL - [XRSessionEvent interface object name] - expected: FAIL - [XRInputSourceEvent interface: attribute inputSource] expected: FAIL @@ -98,18 +86,12 @@ [XRInputSourcesChangeEvent interface: attribute removed] expected: FAIL - [XRSessionEvent interface: existence and properties of interface prototype object's "constructor" property] - expected: FAIL - [XRSession interface: attribute onselectstart] expected: FAIL [XRInputSourceEvent interface: existence and properties of interface prototype object] expected: FAIL - [XRSessionEvent interface: attribute session] - expected: FAIL - [XRReferenceSpaceEvent interface: existence and properties of interface object] expected: FAIL @@ -236,9 +218,6 @@ [XRSession interface: attribute oninputsourceschange] expected: FAIL - [XRSessionEvent interface: existence and properties of interface prototype object] - expected: FAIL - [XRBoundedReferenceSpace interface: existence and properties of interface prototype object] expected: FAIL