servo: Merge #11113 - Trace and finalize BrowsingContext (from jdm:trace_browsingcontext); r=Ms2ger

This is a prerequisite for merging #11044, and is an important correctness fix on its own.

r? @Ms2ger

Source-Repo: https://github.com/servo/servo
Source-Revision: 91cabf8427ae8a7693a56c11abfd32b5058c21de
This commit is contained in:
Josh Matthews
2016-05-11 05:43:41 -07:00
parent 781f219238
commit 0ced0cb759
7 changed files with 46 additions and 9 deletions

View File

@@ -115,6 +115,7 @@ thread_local!(static SCRIPT_THREAD_ROOT: RefCell<Option<*const ScriptThread>> =
pub unsafe fn trace_thread(tr: *mut JSTracer) {
SCRIPT_THREAD_ROOT.with(|root| {
if let Some(script_thread) = *root.borrow() {
debug!("tracing fields of ScriptThread");
(*script_thread).trace(tr);
}
});
@@ -1357,6 +1358,7 @@ impl ScriptThread {
// otherwise find just the matching page and exit all sub-pages
if let Some(ref mut child_page) = page.remove(id) {
debug!("shutting down layout for child context {:?}", id);
shut_down_layout(&*child_page);
}
false