Switch viewerpose to an any attribute

2 files changed, 25 insertions, 15 deletions

diff --git a/components/script/dom/webidls/XRViewerPose.webidl b/components/script/dom/webidls/XRViewerPose.webidl
index caf9f96ba10..cbce4f273e7 100644
--- a/components/script/dom/webidls/XRViewerPose.webidl
+++ b/components/script/dom/webidls/XRViewerPose.webidl
@@ -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;
 };
diff --git a/components/script/dom/xrviewerpose.rs b/components/script/dom/xrviewerpose.rs
index 72420fc0530..af26b23aeb1 100644
--- a/components/script/dom/xrviewerpose.rs
+++ b/components/script/dom/xrviewerpose.rs
@@ -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()
     }
 }