Add active and animationFrame flags to XRFrame

2 files changed, 26 insertions, 1 deletions

diff --git a/components/script/dom/xrframe.rs b/components/script/dom/xrframe.rs
index dad29ea9b9b..8c3bf737ec1 100644
--- a/components/script/dom/xrframe.rs
+++ b/components/script/dom/xrframe.rs
@@ -15,6 +15,7 @@ use crate::dom::xrsession::XRSession;
 use crate::dom::xrspace::XRSpace;
 use crate::dom::xrviewerpose::XRViewerPose;
 use dom_struct::dom_struct;
+use std::cell::Cell;
 use webxr_api::Frame;
 
 #[dom_struct]
@@ -23,6 +24,8 @@ pub struct XRFrame {
     session: Dom<XRSession>,
     #[ignore_malloc_size_of = "defined in rust-webvr"]
     data: Frame,
+    active: Cell<bool>,
+    animation_frame: Cell<bool>,
 }
 
 impl XRFrame {
@@ -31,6 +34,8 @@ impl XRFrame {
             reflector_: Reflector::new(),
             session: Dom::from_ref(session),
             data,
+            active: Cell::new(false),
+            animation_frame: Cell::new(false),
         }
     }
 
@@ -41,6 +46,16 @@ impl XRFrame {
             XRFrameBinding::Wrap,
         )
     }
+
+    /// https://immersive-web.github.io/webxr/#xrframe-active
+    pub fn set_active(&self, active: bool) {
+        self.active.set(active);
+    }
+
+    /// https://immersive-web.github.io/webxr/#xrframe-animationframe
+    pub fn set_animation_frame(&self, animation_frame: bool) {
+        self.animation_frame.set(animation_frame);
+    }
 }
 
 impl XRFrameMethods for XRFrame {
@@ -57,6 +72,11 @@ impl XRFrameMethods for XRFrame {
         if self.session != reference.upcast::<XRSpace>().session() {
             return Err(Error::InvalidState);
         }
+
+        if !self.active.get() || !self.animation_frame.get() {
+            return Err(Error::InvalidState);
+        }
+
         let pose = reference.get_viewer_pose(&self.data);
         Ok(Some(XRViewerPose::new(&self.global(), &self.session, pose)))
     }
@@ -70,6 +90,9 @@ impl XRFrameMethods for XRFrame {
         if self.session != space.session() || self.session != relative_to.session() {
             return Err(Error::InvalidState);
         }
+        if !self.active.get() {
+            return Err(Error::InvalidState);
+        }
         let space = space.get_pose(&self.data);
         let relative_to = relative_to.get_pose(&self.data);
         let pose = relative_to.inverse().pre_mul(&space);
diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs
index da54753b337..77f4b4cafb4 100644
--- a/components/script/dom/xrsession.rs
+++ b/components/script/dom/xrsession.rs
@@ -140,7 +140,9 @@ impl XRSession {
         let mut callbacks = mem::replace(&mut *self.raf_callback_list.borrow_mut(), vec![]);
 
         let frame = XRFrame::new(&self.global(), self, frame);
-        // Step 6-7: XXXManishearth set `active`/`animationFrame` bools on `frame` to true
+        // Step 6,7
+        frame.set_active(true);
+        frame.set_animation_frame(true);
 
         // Step 8
         for (_, callback) in callbacks.drain(..) {