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

Refactor WebGLPaintTask to prevent creating extra IPC channels #9228

Browse source
This commit is contained in:
Josh Leverette 2016-01-10 13:26:15 -06:00
parent d3889b4be4
commit bc1850240f
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/canvas/webgl_paint_thread.rs
View file

@ -187,10 +187,8 @@ impl WebGLPaintThread {
/// sender for it. /// sender for it.
pub fn start(size: Size2D<i32>, attrs: GLContextAttributes) pub fn start(size: Size2D<i32>, attrs: GLContextAttributes)
-> Result<(IpcSender<CanvasMsg>, Sender<CanvasMsg>), &'static str> { -> Result<(IpcSender<CanvasMsg>, Sender<CanvasMsg>), &'static str> {
let (out_of_process_chan, out_of_process_port) = ipc::channel::<CanvasMsg>().unwrap();
let (in_process_chan, in_process_port) = channel(); let (in_process_chan, in_process_port) = channel();
let (result_chan, result_port) = channel(); let (result_chan, result_port) = channel();
ROUTER.route_ipc_receiver_to_mpsc_sender(out_of_process_port, in_process_chan.clone());
spawn_named("WebGLThread".to_owned(), move || { spawn_named("WebGLThread".to_owned(), move || {
let mut painter = match WebGLPaintThread::new(size, attrs) { let mut painter = match WebGLPaintThread::new(size, attrs) {
Ok(thread) => { Ok(thread) => {
@ -230,7 +228,15 @@ impl WebGLPaintThread {
} }
}); });
result_port.recv().unwrap().map(|_| (out_of_process_chan, in_process_chan)) match result_port.recv() {
Ok(_) => {
let (out_of_process_chan, out_of_process_port) = ipc::channel::<CanvasMsg>().unwrap();
ROUTER.route_ipc_receiver_to_mpsc_sender(out_of_process_port, in_process_chan.clone());
Ok((out_of_process_chan, in_process_chan))
},
Err(_) => Err("Could not create WebGLPaintThread.")
}
} }
#[inline] #[inline]