Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

More files with CanGc fixes (#33892)

Browse source 
* More files with CanGc fixes

Signed-off-by: L Ashwin B <lashwinib@gmail.com>

* removed the can_gc inside !task

Signed-off-by: L Ashwin B <lashwinib@gmail.com>

---------

Signed-off-by: L Ashwin B <lashwinib@gmail.com>
This commit is contained in:
chickenleaf 2024-10-18 19:12:43 +05:30 • committed by GitHub
parent fde8d72aca
commit af6154cf63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 226 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/xrframe.rs
View file

@ -25,6 +25,7 @@ use crate::dom::xrreferencespace::XRReferenceSpace;
use crate::dom::xrsession::{ApiPose, XRSession};
use crate::dom::xrspace::XRSpace;
use crate::dom::xrviewerpose::XRViewerPose;
use crate::script_runtime::CanGc;
#[dom_struct]
pub struct XRFrame {
@ -92,6 +93,7 @@ impl XRFrameMethods for XRFrame {
fn GetViewerPose(
&self,
reference: &XRReferenceSpace,
can_gc: CanGc,
) -> Result<Option<DomRoot<XRViewerPose>>, Error> {
if self.session != reference.upcast::<XRSpace>().session() {
return Err(Error::InvalidState);
@ -116,6 +118,7 @@ impl XRFrameMethods for XRFrame {
&self.session,
to_base,
viewer_pose,
can_gc,
)))
}
@ -124,6 +127,7 @@ impl XRFrameMethods for XRFrame {
&self,
space: &XRSpace,
base_space: &XRSpace,
can_gc: CanGc,
) -> Result<Option<DomRoot<XRPose>>, Error> {
if self.session != space.session() || self.session != base_space.session() {
return Err(Error::InvalidState);
@ -142,7 +146,7 @@ impl XRFrameMethods for XRFrame {
return Ok(None);
};
let pose = space.then(&base_space.inverse());
Ok(Some(XRPose::new(&self.global(), pose)))
Ok(Some(XRPose::new(&self.global(), pose, can_gc)))
}
/// <https://immersive-web.github.io/webxr/#dom-xrframe-getpose>
@ -150,6 +154,7 @@ impl XRFrameMethods for XRFrame {
&self,
space: &XRJointSpace,
base_space: &XRSpace,
can_gc: CanGc,
) -> Result<Option<DomRoot<XRJointPose>>, Error> {
if self.session != space.upcast::<XRSpace>().session() ||
self.session != base_space.session()
@ -174,6 +179,7 @@ impl XRFrameMethods for XRFrame {
&self.global(),
pose.cast_unit(),
Some(joint_frame.radius),
can_gc,
)))
}