Rename incorrectly-named get_pose methods

3 files changed, 21 insertions, 10 deletions

diff --git a/components/script/dom/xrreferencespace.rs b/components/script/dom/xrreferencespace.rs
index ed42d63b4be..ce81a714e80 100644
--- a/components/script/dom/xrreferencespace.rs
+++ b/components/script/dom/xrreferencespace.rs
@@ -54,9 +54,9 @@ impl XRReferenceSpaceMethods for XRReferenceSpace {
 }
 
 impl XRReferenceSpace {
-    /// Gets viewer pose represented by this space
+    /// Gets pose of the viewer with respect to this space
     pub fn get_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
-        let pose = self.get_pose(base_pose);
+        let pose = self.get_unoffset_viewer_pose(base_pose);
 
         // This may change, see https://github.com/immersive-web/webxr/issues/567
         let offset = self.transform.get().transform();
@@ -64,16 +64,25 @@ impl XRReferenceSpace {
         inverse.pre_mul(&pose)
     }
 
-    /// Gets pose represented by this space
+    /// Gets pose of the viewer with respect to this space
     ///
     /// Does not apply originOffset, use get_viewer_pose instead if you need it
-    pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
+    pub fn get_unoffset_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
         if let Some(stationary) = self.downcast::<XRStationaryReferenceSpace>() {
-            stationary.get_pose(base_pose)
+            stationary.get_unoffset_viewer_pose(base_pose)
         } else {
             // non-subclassed XRReferenceSpaces exist, obtained via the "identity"
             // type. The pose does not depend on the base pose.
             RigidTransform3D::identity()
         }
     }
+
+    /// Gets pose represented by this space
+    ///
+    /// The reference origin used is common between all
+    /// get_pose calls for spaces from the same device, so this can be used to compare
+    /// with other spaces
+    pub fn get_pose(&self, _: &WebVRFrameData) -> RigidTransform3D<f64> {
+        unimplemented!()
+    }
 }
diff --git a/components/script/dom/xrspace.rs b/components/script/dom/xrspace.rs
index 60589be4054..8bc62ae5d9e 100644
--- a/components/script/dom/xrspace.rs
+++ b/components/script/dom/xrspace.rs
@@ -39,7 +39,7 @@ impl XRSpace {
 }
 
 impl XRSpace {
-    /// Gets viewer pose represented by this space
+    /// Gets pose of the viewer with respect to this space
     #[allow(unused)]
     pub fn get_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
         if let Some(reference) = self.downcast::<XRReferenceSpace>() {
@@ -51,7 +51,9 @@ impl XRSpace {
 
     /// Gets pose represented by this space
     ///
-    /// Does not apply originOffset, use get_viewer_pose instead if you need it
+    /// The reference origin used is common between all
+    /// get_pose calls for spaces from the same device, so this can be used to compare
+    /// with other spaces
     #[allow(unused)]
     pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
         if let Some(reference) = self.downcast::<XRReferenceSpace>() {
diff --git a/components/script/dom/xrstationaryreferencespace.rs b/components/script/dom/xrstationaryreferencespace.rs
index ddba9aaa20b..5a7a9c49e6d 100644
--- a/components/script/dom/xrstationaryreferencespace.rs
+++ b/components/script/dom/xrstationaryreferencespace.rs
@@ -50,10 +50,10 @@ impl XRStationaryReferenceSpace {
 }
 
 impl XRStationaryReferenceSpace {
-    /// Gets pose represented by this space
+    /// Gets pose of the viewer with respect to this space
     ///
-    /// Does not apply originOffset, use get_viewer_pose instead
-    pub fn get_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
+    /// Does not apply originOffset, use get_viewer_pose on XRReferenceSpace instead
+    pub fn get_unoffset_viewer_pose(&self, base_pose: &WebVRFrameData) -> RigidTransform3D<f64> {
         // XXXManishearth add floor-level transform for floor-level and disable position in position-disabled
         let pos = base_pose.pose.position.unwrap_or([0., 0., 0.]);
         let translation = Vector3D::new(pos[0] as f64, pos[1] as f64, pos[2] as f64);