diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2020-01-13 15:31:31 +0530 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2020-01-21 15:47:30 -0800 |
commit | e0135fe7832382b01d3269f6d231477196d09b4f (patch) | |
tree | 85ec8da24d41e5f36ab900301cf0009fd66ed5f3 /components/script/dom/xrinputsource.rs | |
parent | 9c34a6585b50b7c20468060dafca717d1d363e6c (diff) | |
download | servo-e0135fe7832382b01d3269f6d231477196d09b4f.tar.gz servo-e0135fe7832382b01d3269f6d231477196d09b4f.zip |
Support profiles
Diffstat (limited to 'components/script/dom/xrinputsource.rs')
-rw-r--r-- | components/script/dom/xrinputsource.rs | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/components/script/dom/xrinputsource.rs b/components/script/dom/xrinputsource.rs index fed76937d9c..e0da8bea550 100644 --- a/components/script/dom/xrinputsource.rs +++ b/components/script/dom/xrinputsource.rs @@ -2,6 +2,7 @@ * 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::compartments::enter_realm; use crate::dom::bindings::codegen::Bindings::XRInputSourceBinding; use crate::dom::bindings::codegen::Bindings::XRInputSourceBinding::{ XRHandedness, XRInputSourceMethods, XRTargetRayMode, @@ -11,7 +12,11 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::globalscope::GlobalScope; use crate::dom::xrsession::XRSession; use crate::dom::xrspace::XRSpace; +use crate::script_runtime::JSContext; use dom_struct::dom_struct; +use js::conversions::ToJSValConvertible; +use js::jsapi::Heap; +use js::jsval::{JSVal, UndefinedValue}; use webxr_api::{Handedness, InputId, InputSource, TargetRayMode}; #[dom_struct] @@ -24,6 +29,8 @@ pub struct XRInputSource { target_ray_space: MutNullableDom<XRSpace>, #[ignore_malloc_size_of = "Defined in rust-webxr"] grip_space: MutNullableDom<XRSpace>, + #[ignore_malloc_size_of = "mozjs"] + profiles: Heap<JSVal>, } impl XRInputSource { @@ -34,19 +41,30 @@ impl XRInputSource { info, target_ray_space: Default::default(), grip_space: Default::default(), + profiles: Heap::default(), } } + #[allow(unsafe_code)] pub fn new( global: &GlobalScope, session: &XRSession, info: InputSource, ) -> DomRoot<XRInputSource> { - reflect_dom_object( + let source = reflect_dom_object( Box::new(XRInputSource::new_inherited(session, info)), global, XRInputSourceBinding::Wrap, - ) + ); + + let _ac = enter_realm(&*global); + let cx = global.get_cx(); + unsafe { + rooted!(in(*cx) let mut profiles = UndefinedValue()); + source.info.profiles.to_jsval(*cx, profiles.handle_mut()); + source.profiles.set(profiles.get()); + } + source } pub fn id(&self) -> InputId { @@ -92,4 +110,8 @@ impl XRInputSourceMethods for XRInputSource { None } } + // https://immersive-web.github.io/webxr/#dom-xrinputsource-profiles + fn Profiles(&self, _cx: JSContext) -> JSVal { + self.profiles.get() + } } |