Skip to content

Commit

Permalink
Switch viewerpose to an any attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
Manishearth committed Dec 23, 2018
1 parent 64a64a8 commit feb2a2d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
2 changes: 1 addition & 1 deletion components/script/dom/webidls/XRViewerPose.webidl
Expand Up @@ -9,5 +9,5 @@ interface XRViewerPose {
// readonly attribute XRRigidTransform transform;
// readonly attribute FrozenArray<XRView> views;
// workaround until we have FrozenArray
sequence<XRView> views();
readonly attribute any views;
};
38 changes: 24 additions & 14 deletions components/script/dom/xrviewerpose.rs
Expand Up @@ -5,42 +5,52 @@
use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding;
use crate::dom::bindings::codegen::Bindings::XRViewerPoseBinding::XRViewerPoseMethods;
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::xrview::XRView;
use dom_struct::dom_struct;
use js::conversions::ToJSValConvertible;
use js::jsapi::{Heap, JSContext};
use js::jsval::{JSVal, UndefinedValue};

#[dom_struct]
pub struct XRViewerPose {
reflector_: Reflector,
left: Dom<XRView>,
right: Dom<XRView>,
views: Heap<JSVal>,
}

impl XRViewerPose {
fn new_inherited(left: &XRView, right: &XRView) -> XRViewerPose {
fn new_inherited() -> XRViewerPose {
XRViewerPose {
reflector_: Reflector::new(),
left: Dom::from_ref(left),
right: Dom::from_ref(right),
views: Heap::default(),
}
}

#[allow(unsafe_code)]
pub fn new(global: &GlobalScope, left: &XRView, right: &XRView) -> DomRoot<XRViewerPose> {
reflect_dom_object(
Box::new(XRViewerPose::new_inherited(left, right)),
let pose = reflect_dom_object(
Box::new(XRViewerPose::new_inherited()),
global,
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 {
/// https://immersive-web.github.io/webxr/#dom-xrviewerpose-views
fn Views(&self) -> Vec<DomRoot<XRView>> {
vec![
DomRoot::from_ref(&self.left),
DomRoot::from_ref(&self.right),
]
#[allow(unsafe_code)]
unsafe fn Views(&self, _cx: *mut JSContext) -> JSVal {
self.views.get()
}
}

0 comments on commit feb2a2d

Please sign in to comment.