Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move script local_data_pop out of dtor

Browse source 
Fixes #570, which was caused by a second reentrant call to the dtor.
This commit is contained in:
Keegan McAllister 2013-07-15 10:37:57 -07:00
parent cca33c2027
commit 4fd6ad3d5c
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/constellation.rs
View file

@ -254,12 +254,10 @@ impl Constellation {
// Don't navigate on Navigate type, because that is handled by forward/back // Don't navigate on Navigate type, because that is handled by forward/back
match pipeline.navigation_type.get() { match pipeline.navigation_type.get() {
constellation_msg::Load => { constellation_msg::Load => {
let _evicted = self.navigation_context.navigate(id); let evicted = self.navigation_context.navigate(id);
/* FIXME(tkuehn): the following code causes a segfault
for evicted.iter().advance |id| { for evicted.iter().advance |id| {
self.pipelines.get(id).exit(); self.pipelines.get(id).exit();
} }
*/
} }
_ => {} _ => {}
} }

15
src/components/script/script_task.rs
View file

@ -167,15 +167,6 @@ pub fn task_from_context(js_context: *JSContext) -> *mut ScriptTask {
} }
} }
#[unsafe_destructor]
impl Drop for ScriptTask {
fn drop(&self) {
unsafe {
let _ = local_data::local_data_pop(global_script_context_key);
}
}
}
impl ScriptTask { impl ScriptTask {
/// Creates a new script task. /// Creates a new script task.
pub fn new(id: uint, pub fn new(id: uint,
@ -362,7 +353,11 @@ impl ScriptTask {
frame.document.teardown(); frame.document.teardown();
} }
self.layout_chan.send(layout_interface::ExitMsg) self.layout_chan.send(layout_interface::ExitMsg);
unsafe {
let _ = local_data::local_data_pop(global_script_context_key);
}
} }
/// The entry point to document loading. Defines bindings, sets up the window and document /// The entry point to document loading. Defines bindings, sets up the window and document