1 files changed, 25 insertions, 15 deletions
diff --git a/components/script/dom/xrlayer.rs b/components/script/dom/xrlayer.rs
index e70cdb5085a..b55df545e37 100644
--- a/components/script/dom/xrlayer.rs
+++ b/components/script/dom/xrlayer.rs
@@ -6,30 +6,22 @@ use crate::dom::bindings::codegen::Bindings::XRLayerBinding::XRLayerBinding::XRL
 use crate::dom::bindings::reflector::Reflector;
 use crate::dom::bindings::root::Dom;
 use crate::dom::webglrenderingcontext::WebGLRenderingContext;
+use crate::dom::xrframe::XRFrame;
 use crate::dom::xrsession::XRSession;
+use canvas_traits::webgl::WebGLContextId;
 use dom_struct::dom_struct;
-use euclid::Size2D;
-use webxr_api::Viewport;
+use webxr_api::LayerId;
 
 #[dom_struct]
 pub struct XRLayer {
     reflector: Reflector,
     session: Dom<XRSession>,
     context: Dom<WebGLRenderingContext>,
-    size: Size2D<u32, Viewport>,
+    #[ignore_malloc_size_of = "Layers don't heap-allocate"]
+    layer_id: LayerId,
 }
 
 impl XRLayerMethods for XRLayer {
-    /// https://immersive-web.github.io/layers/#dom-xrlayer-pixelwidth
-    fn PixelWidth(&self) -> u32 {
-        self.size.width
-    }
-
-    /// https://immersive-web.github.io/layers/#dom-xrlayer-pixelheight
-    fn PixelHeight(&self) -> u32 {
-        self.size.height
-    }
-
     /// https://immersive-web.github.io/layers/#dom-xrlayer-destroy
     fn Destroy(&self) {
         // TODO: Implement this
@@ -41,13 +33,31 @@ impl XRLayer {
     pub fn new_inherited(
         session: &XRSession,
         context: &WebGLRenderingContext,
-        size: Size2D<u32, Viewport>,
+        layer_id: LayerId,
     ) -> XRLayer {
         XRLayer {
             reflector: Reflector::new(),
             session: Dom::from_ref(session),
             context: Dom::from_ref(context),
-            size: size,
+            layer_id,
         }
     }
+
+    pub(crate) fn layer_id(&self) -> LayerId {
+        self.layer_id
+    }
+
+    pub(crate) fn context_id(&self) -> WebGLContextId {
+        self.context.context_id()
+    }
+
+    pub fn begin_frame(&self, _frame: &XRFrame) -> Option<()> {
+        // TODO: Implement this
+        None
+    }
+
+    pub fn end_frame(&self, _frame: &XRFrame) -> Option<()> {
+        // TODO: Implement this
+        None
+    }
 }