script task only exits when the root pipeline exits

This commit is contained in:
Tim Kuehn 2013-09-21 15:37:30 -04:00
parent c56b015623
commit 99f125bb64
3 changed files with 49 additions and 12 deletions

View file

@ -212,7 +212,7 @@ impl Window {
match timer_port.recv() {
TimerMessage_Close => break,
TimerMessage_Fire(td) => script_chan.send(FireTimerMsg(id, td)),
TimerMessage_TriggerExit => script_chan.send(ExitMsg),
TimerMessage_TriggerExit => script_chan.send(ExitMsg(id)),
}
}
}
@ -225,7 +225,6 @@ impl Window {
};
unsafe {
// TODO(tkuehn): This just grabs the top-level page. Need to handle subframes.
let cache = ptr::to_unsafe_ptr(win.get_wrappercache());
win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope
let global = (*cache).wrapper;