From 341d36a82604e9272af8497f81f5ad0826f4e152 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 9 Apr 2020 14:43:51 -0700 Subject: [PATCH] Add XRHitTestSource --- components/script/dom/bindings/trace.rs | 3 +- components/script/dom/mod.rs | 1 + .../script/dom/webidls/XRHitTestSource.webidl | 11 +++++ components/script/dom/xrhittestsource.rs | 47 +++++++++++++++++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 components/script/dom/webidls/XRHitTestSource.webidl create mode 100644 components/script/dom/xrhittestsource.rs diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 2b6058e826b..b460a90b4b0 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -553,7 +553,8 @@ unsafe_no_jsmanaged_fields!( webxr_api::Session, webxr_api::Frame, webxr_api::InputSource, - webxr_api::InputId + webxr_api::InputId, + webxr_api::HitTestId ); unsafe_no_jsmanaged_fields!(ScriptToConstellationChan); unsafe_no_jsmanaged_fields!(InteractiveMetrics); diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 330f083397b..17653d9536b 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -572,6 +572,7 @@ pub mod xmlhttprequesteventtarget; pub mod xmlhttprequestupload; pub mod xmlserializer; pub mod xrframe; +pub mod xrhittestsource; pub mod xrinputsource; pub mod xrinputsourcearray; pub mod xrinputsourceevent; diff --git a/components/script/dom/webidls/XRHitTestSource.webidl b/components/script/dom/webidls/XRHitTestSource.webidl new file mode 100644 index 00000000000..92faf352686 --- /dev/null +++ b/components/script/dom/webidls/XRHitTestSource.webidl @@ -0,0 +1,11 @@ +/* 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/hit-test/#xrhittestsource-interface + + +[SecureContext, Exposed=Window] +interface XRHitTestSource { + void cancel(); +}; diff --git a/components/script/dom/xrhittestsource.rs b/components/script/dom/xrhittestsource.rs new file mode 100644 index 00000000000..8825c1e7e7c --- /dev/null +++ b/components/script/dom/xrhittestsource.rs @@ -0,0 +1,47 @@ +/* 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::XRHitTestSourceBinding::XRHitTestSourceMethods; +use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; +use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::globalscope::GlobalScope; +use crate::dom::xrsession::XRSession; +use dom_struct::dom_struct; +use webxr_api::HitTestId; + +#[dom_struct] +pub struct XRHitTestSource { + reflector_: Reflector, + #[ignore_malloc_size_of = "defined in webxr"] + id: HitTestId, + session: Dom, +} + +impl XRHitTestSource { + fn new_inherited(id: HitTestId, session: &XRSession) -> XRHitTestSource { + XRHitTestSource { + reflector_: Reflector::new(), + id, + session: Dom::from_ref(session), + } + } + + pub fn new( + global: &GlobalScope, + id: HitTestId, + session: &XRSession, + ) -> DomRoot { + reflect_dom_object( + Box::new(XRHitTestSource::new_inherited(id, session)), + global, + ) + } +} + +impl XRHitTestSourceMethods for XRHitTestSource { + // https://immersive-web.github.io/hit-test/#dom-xrhittestsource-cancel + fn Cancel(&self) { + self.session.with_session(|s| s.cancel_hit_test(self.id)); + } +}