Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve handling of missing layer_ctx

Browse source
This commit is contained in:
Manish Goregaokar 2019-01-15 13:14:13 -08:00
parent 87558c3a17
commit 1a64b217af
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/script/dom/vrdisplay.rs
View file

@ -437,7 +437,8 @@ impl VRDisplayMethods for VRDisplay {
let display_id = self.display.borrow().display_id; let display_id = self.display.borrow().display_id;
let layer = self.layer.borrow(); let layer = self.layer.borrow();
let msg = WebVRCommand::SubmitFrame(display_id, layer.left_bounds, layer.right_bounds); let msg = WebVRCommand::SubmitFrame(display_id, layer.left_bounds, layer.right_bounds);
self.layer_ctx.get().unwrap().send_vr_command(msg); self.layer_ctx.get().expect("SubmitFrame can only be called when there is a webgl layer")
.send_vr_command(msg);
} }
// https://w3c.github.io/webvr/spec/1.1/#dom-vrdisplay-getlayers // https://w3c.github.io/webvr/spec/1.1/#dom-vrdisplay-getlayers
@ -757,12 +758,12 @@ impl VRDisplay {
let xr = self.global().as_window().Navigator().Xr(); let xr = self.global().as_window().Navigator().Xr();
xr.deactivate_session(); xr.deactivate_session();
*self.frame_data_receiver.borrow_mut() = None; *self.frame_data_receiver.borrow_mut() = None;
if let Some(api_sender) = self.api_sender() {
let api_sender = self.layer_ctx.get().unwrap().webgl_sender(); let display_id = self.display.borrow().display_id;
let display_id = self.display.borrow().display_id; api_sender
api_sender .send_vr(WebVRCommand::Release(display_id))
.send_vr(WebVRCommand::Release(display_id)) .unwrap();
.unwrap(); }
} }
// Only called when the JSContext is destroyed while presenting. // Only called when the JSContext is destroyed while presenting.