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

Switch viewerpose to an any attribute

Browse source
This commit is contained in:
Manish Goregaokar 2018-12-22 22:44:05 -08:00
parent 64a64a8d6d
commit feb2a2d3c9
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,5 +9,5 @@ interface XRViewerPose {
// readonly attribute XRRigidTransform transform; // readonly attribute XRRigidTransform transform;
// readonly attribute FrozenArray<XRView> views; // readonly attribute FrozenArray<XRView> views;
// workaround until we have FrozenArray // workaround until we have FrozenArray
sequence<XRView> views(); readonly attribute any views;
}; };

38
components/script/dom/xrviewerpose.rs
View file

@ -5,42 +5,52 @@
use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding; use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding;
use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding::XRViewerPoseMethods; use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding::XRViewerPoseMethods;
use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::root::DomRoot;
use crate::dom::globalscope::GlobalScope; use crate::dom::globalscope::GlobalScope;
use crate::dom::xrview::XRView; use crate::dom::xrview::XRView;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use js::conversions::ToJSValConvertible;
use js::jsapi::{Heap, JSContext};
use js::jsval::{JSVal, UndefinedValue};
#[dom_struct] #[dom_struct]
pub struct XRViewerPose { pub struct XRViewerPose {
reflector_: Reflector, reflector_: Reflector,
left: Dom<XRView>, views: Heap<JSVal>,
right: Dom<XRView>,
} }
impl XRViewerPose { impl XRViewerPose {
fn new_inherited(left: &XRView, right: &XRView) -> XRViewerPose { fn new_inherited() -> XRViewerPose {
XRViewerPose { XRViewerPose {
reflector_: Reflector::new(), reflector_: Reflector::new(),
left: Dom::from_ref(left), views: Heap::default(),
right: Dom::from_ref(right),
} }
} }
#[allow(unsafe_code)]
pub fn new(global: &GlobalScope, left: &XRView, right: &XRView) -> DomRoot<XRViewerPose> { pub fn new(global: &GlobalScope, left: &XRView, right: &XRView) -> DomRoot<XRViewerPose> {
reflect_dom_object( let pose = reflect_dom_object(
Box::new(XRViewerPose::new_inherited(left, right)), Box::new(XRViewerPose::new_inherited()),
global, global,
XRViewerPoseBinding::Wrap, XRViewerPoseBinding::Wrap,
) );
unsafe {
let cx = global.get_cx();
rooted!(in(cx) let mut jsval = UndefinedValue());
let vec = vec![DomRoot::from_ref(left), DomRoot::from_ref(right)];
vec.to_jsval(cx, jsval.handle_mut());
pose.views.set(jsval.get());
}
pose
} }
} }
impl XRViewerPoseMethods for XRViewerPose { impl XRViewerPoseMethods for XRViewerPose {
/// https://immersive-web.github.io/webxr/#dom-xrviewerpose-views /// https://immersive-web.github.io/webxr/#dom-xrviewerpose-views
fn Views(&self) -> Vec<DomRoot<XRView>> { #[allow(unsafe_code)]
vec![ unsafe fn Views(&self, _cx: *mut JSContext) -> JSVal {
DomRoot::from_ref(&self.left), self.views.get()
DomRoot::from_ref(&self.right),
]
} }
} }