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

Avoid accessing DOM global from XR's destructor.

Browse source
This commit is contained in:
Josh Matthews 2019-12-19 18:14:49 -05:00
parent fda0572a93
commit 3e95efdea6
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/navigator.rs
View file

@ -184,7 +184,8 @@ impl NavigatorMethods for Navigator {
/// https://immersive-web.github.io/webxr/#dom-navigator-xr /// https://immersive-web.github.io/webxr/#dom-navigator-xr
fn Xr(&self) -> DomRoot<XRSystem> { fn Xr(&self) -> DomRoot<XRSystem> {
self.xr.or_init(|| XRSystem::new(&self.global())) self.xr
.or_init(|| XRSystem::new(&self.global().as_window()))
} }
/// https://w3c.github.io/mediacapture-main/#dom-navigator-mediadevices /// https://w3c.github.io/mediacapture-main/#dom-navigator-mediadevices

33
components/script/dom/xrsystem.rs
View file

@ -18,10 +18,10 @@ use crate::dom::event::Event;
use crate::dom::eventtarget::EventTarget; use crate::dom::eventtarget::EventTarget;
use crate::dom::gamepad::Gamepad; use crate::dom::gamepad::Gamepad;
use crate::dom::gamepadevent::GamepadEventType; use crate::dom::gamepadevent::GamepadEventType;
use crate::dom::globalscope::GlobalScope;
use crate::dom::promise::Promise; use crate::dom::promise::Promise;
use crate::dom::vrdisplay::VRDisplay; use crate::dom::vrdisplay::VRDisplay;
use crate::dom::vrdisplayevent::VRDisplayEvent; use crate::dom::vrdisplayevent::VRDisplayEvent;
use crate::dom::window::Window;
use crate::dom::xrsession::XRSession; use crate::dom::xrsession::XRSession;
use crate::dom::xrtest::XRTest; use crate::dom::xrtest::XRTest;
use crate::realms::InRealm; use crate::realms::InRealm;
@ -30,6 +30,7 @@ use crate::task_source::TaskSource;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use ipc_channel::ipc::{self as ipc_crate, IpcReceiver, IpcSender}; use ipc_channel::ipc::{self as ipc_crate, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER; use ipc_channel::router::ROUTER;
use msg::constellation_msg::PipelineId;
use profile_traits::ipc; use profile_traits::ipc;
use std::cell::Cell; use std::cell::Cell;
use std::rc::Rc; use std::rc::Rc;
@ -46,10 +47,13 @@ pub struct XRSystem {
active_immersive_session: MutNullableDom<XRSession>, active_immersive_session: MutNullableDom<XRSession>,
active_inline_sessions: DomRefCell<Vec<Dom<XRSession>>>, active_inline_sessions: DomRefCell<Vec<Dom<XRSession>>>,
test: MutNullableDom<XRTest>, test: MutNullableDom<XRTest>,
pipeline: PipelineId,
#[ignore_malloc_size_of = "channels are hard"]
webvr_thread: Option<IpcSender<WebVRMsg>>,
} }
impl XRSystem { impl XRSystem {
fn new_inherited() -> XRSystem { fn new_inherited(pipeline: PipelineId, webvr_thread: Option<IpcSender<WebVRMsg>>) -> XRSystem {
XRSystem { XRSystem {
eventtarget: EventTarget::new_inherited(), eventtarget: EventTarget::new_inherited(),
displays: DomRefCell::new(Vec::new()), displays: DomRefCell::new(Vec::new()),
@ -58,13 +62,18 @@ impl XRSystem {
active_immersive_session: Default::default(), active_immersive_session: Default::default(),
active_inline_sessions: DomRefCell::new(Vec::new()), active_inline_sessions: DomRefCell::new(Vec::new()),
test: Default::default(), test: Default::default(),
pipeline,
webvr_thread,
} }
} }
pub fn new(global: &GlobalScope) -> DomRoot<XRSystem> { pub fn new(window: &Window) -> DomRoot<XRSystem> {
let root = reflect_dom_object( let root = reflect_dom_object(
Box::new(XRSystem::new_inherited()), Box::new(XRSystem::new_inherited(
global, window.pipeline_id(),
window.webvr_thread(),
)),
window,
XRSystemBinding::Wrap, XRSystemBinding::Wrap,
); );
root.register(); root.register();
@ -304,7 +313,7 @@ impl XRSystem {
} }
pub fn get_displays(&self) -> Result<Vec<DomRoot<VRDisplay>>, ()> { pub fn get_displays(&self) -> Result<Vec<DomRoot<VRDisplay>>, ()> {
if let Some(webvr_thread) = self.webvr_thread() { if let Some(ref webvr_thread) = self.webvr_thread {
let (sender, receiver) = let (sender, receiver) =
ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); ipc::channel(self.global().time_profiler_chan().clone()).unwrap();
webvr_thread.send(WebVRMsg::GetDisplays(sender)).unwrap(); webvr_thread.send(WebVRMsg::GetDisplays(sender)).unwrap();
@ -333,10 +342,6 @@ impl XRSystem {
.collect()) .collect())
} }
fn webvr_thread(&self) -> Option<IpcSender<WebVRMsg>> {
self.global().as_window().webvr_thread()
}
fn find_display(&self, display_id: u32) -> Option<DomRoot<VRDisplay>> { fn find_display(&self, display_id: u32) -> Option<DomRoot<VRDisplay>> {
self.displays self.displays
.borrow() .borrow()
@ -346,15 +351,15 @@ impl XRSystem {
} }
fn register(&self) { fn register(&self) {
if let Some(webvr_thread) = self.webvr_thread() { if let Some(ref webvr_thread) = self.webvr_thread {
let msg = WebVRMsg::RegisterContext(self.global().pipeline_id()); let msg = WebVRMsg::RegisterContext(self.global().pipeline_id());
webvr_thread.send(msg).unwrap(); webvr_thread.send(msg).unwrap();
} }
} }
fn unregister(&self) { fn unregister(&self) {
if let Some(webvr_thread) = self.webvr_thread() { if let Some(ref webvr_thread) = self.webvr_thread {
let msg = WebVRMsg::UnregisterContext(self.global().pipeline_id()); let msg = WebVRMsg::UnregisterContext(self.pipeline);
webvr_thread.send(msg).unwrap(); webvr_thread.send(msg).unwrap();
} }
} }
@ -474,7 +479,7 @@ impl XRSystem {
// guarantees that the gamepads always have a valid state and can be very useful for // guarantees that the gamepads always have a valid state and can be very useful for
// motion capture or drawing applications. // motion capture or drawing applications.
pub fn get_gamepads(&self) -> Vec<DomRoot<Gamepad>> { pub fn get_gamepads(&self) -> Vec<DomRoot<Gamepad>> {
if let Some(wevbr_sender) = self.webvr_thread() { if let Some(ref wevbr_sender) = self.webvr_thread {
let (sender, receiver) = let (sender, receiver) =
ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); ipc::channel(self.global().time_profiler_chan().clone()).unwrap();
let synced_ids = self let synced_ids = self