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

Use an RAII guard to join the script task.

Browse source
This commit is contained in:
Bobby Holley 2015-10-20 15:40:47 -07:00
parent 630b9f8fa0
commit 85596b5510
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout/layout_task.rs
View file

@ -67,7 +67,7 @@ use std::cell::Cell;
use std::collections::HashMap;
use std::collections::hash_state::DefaultState;
use std::mem::transmute;
use std::ops::{Deref, DerefMut};
use std::ops::{Deref, DerefMut, Drop};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{channel, Sender, Receiver};
use std::sync::{Arc, Mutex, MutexGuard};
@ -1125,6 +1125,17 @@ impl LayoutTask {
fn handle_reflow<'a>(&'a self,
data: &ScriptReflow,
possibly_locked_rw_data: &mut Option<MutexGuard<'a, LayoutTaskData>>) {
// Make sure that every return path from this method joins the script task,
// otherwise the script task will panic.
struct AutoJoinScriptTask<'a> { data: &'a ScriptReflow };
impl<'a> Drop for AutoJoinScriptTask<'a> {
fn drop(&mut self) {
self.data.script_join_chan.send(()).unwrap();
}
};
let _ajst = AutoJoinScriptTask { data: data };
// FIXME: Isolate this transmutation into a "bridge" module.
// FIXME(rust#16366): The following line had to be moved because of a
// rustc bug. It should be in the next unsafe block.
@ -1245,9 +1256,6 @@ impl LayoutTask {
ReflowQueryType::NoQuery => {}
}
}
// Tell script that we're done.
data.script_join_chan.send(()).unwrap();
}
fn set_visible_rects<'a>(&'a self,