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

Send information to script as part of finishing layout.

Browse source 
This avoids the need for multiple layout RPC operations immediately
following return of control to script. This means that layout and
script can continue to operate in parallel at this point, rather
than one potentially waiting on the shared mutex to be unlocked.
This commit is contained in:
Josh Matthews 2017-04-10 17:47:20 +10:00
parent c3b9714ab7
commit 9134918844
5 changed files with 60 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/window.rs
View file

@ -1214,16 +1214,16 @@ impl Window {
debug!("script: layout forked");
match join_port.try_recv() {
let complete = match join_port.try_recv() {
Err(Empty) => {
info!("script: waiting on layout");
join_port.recv().unwrap();
join_port.recv().unwrap()
}
Ok(_) => {}
Ok(reflow_complete) => reflow_complete,
Err(Disconnected) => {
panic!("Layout thread failed while script was waiting for a result.");
}
}
};
debug!("script: layout joined");
@ -1237,8 +1237,7 @@ impl Window {
self.emit_timeline_marker(marker.end());
}
let pending_images = self.layout_rpc.pending_images();
for image in pending_images {
for image in complete.pending_images {
let id = image.id;
let js_runtime = self.js_runtime.borrow();
let js_runtime = js_runtime.as_ref().unwrap();
@ -1262,8 +1261,7 @@ impl Window {
}
}
let newly_transitioning_nodes = self.layout_rpc.newly_transitioning_nodes();
ScriptThread::note_newly_transitioning_nodes(newly_transitioning_nodes);
ScriptThread::note_newly_transitioning_nodes(complete.newly_transitioning_nodes);
true
}