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

Force a GC when shutting down each layout task. Fixes #2342.

Browse source
This commit is contained in:
Josh Matthews 2014-05-06 11:56:23 -04:00
parent 8d1b9db5aa
commit d0387a399b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@ use geom::point::Point2D;
use geom::size::Size2D; use geom::size::Size2D;
use js::global::DEBUG_FNS; use js::global::DEBUG_FNS;
use js::jsapi::{JS_CallFunctionValue, JS_DefineFunctions}; use js::jsapi::{JS_CallFunctionValue, JS_DefineFunctions};
use js::jsapi::{JS_SetWrapObjectCallbacks, JS_SetGCZeal, JS_DEFAULT_ZEAL_FREQ}; use js::jsapi::{JS_SetWrapObjectCallbacks, JS_SetGCZeal, JS_DEFAULT_ZEAL_FREQ, JS_GC};
use js::jsapi::{JSContext, JSRuntime}; use js::jsapi::{JSContext, JSRuntime};
use js::jsval::NullValue; use js::jsval::NullValue;
use js::rust::{Cx, RtUtils}; use js::rust::{Cx, RtUtils};
@ -872,14 +872,14 @@ impl ScriptTask {
if page_tree.page().id == id { if page_tree.page().id == id {
debug!("shutting down layout for root page {:?}", id); debug!("shutting down layout for root page {:?}", id);
*self.js_context.borrow_mut() = None; *self.js_context.borrow_mut() = None;
shut_down_layout(&mut *page_tree); shut_down_layout(&mut *page_tree, (*self.js_runtime).ptr);
return true return true
} }
// otherwise find just the matching page and exit all sub-pages // otherwise find just the matching page and exit all sub-pages
match page_tree.remove(id) { match page_tree.remove(id) {
Some(ref mut page_tree) => { Some(ref mut page_tree) => {
shut_down_layout(&mut *page_tree); shut_down_layout(&mut *page_tree, (*self.js_runtime).ptr);
false false
} }
// TODO(tkuehn): pipeline closing is currently duplicated across // TODO(tkuehn): pipeline closing is currently duplicated across
@ -1247,7 +1247,7 @@ impl ScriptTask {
} }
/// Shuts down layout for the given page tree. /// Shuts down layout for the given page tree.
fn shut_down_layout(page_tree: &mut PageTree) { fn shut_down_layout(page_tree: &mut PageTree, rt: *JSRuntime) {
for page in page_tree.iter() { for page in page_tree.iter() {
page.join_layout(); page.join_layout();
@ -1269,6 +1269,12 @@ fn shut_down_layout(page_tree: &mut PageTree) {
*page.mut_js_info() = None; *page.mut_js_info() = None;
} }
// Force a GC to make sure that our DOM reflectors are released before we tell
// layout to exit.
unsafe {
JS_GC(rt);
}
// Destroy the layout task. If there were node leaks, layout will now crash safely. // Destroy the layout task. If there were node leaks, layout will now crash safely.
for page in page_tree.iter() { for page in page_tree.iter() {
let LayoutChan(ref chan) = *page.layout_chan; let LayoutChan(ref chan) = *page.layout_chan;