diff options
author | Nicholas Nethercote <nnethercote@mozilla.com> | 2015-08-17 04:37:43 -0700 |
---|---|---|
committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2015-08-17 04:37:43 -0700 |
commit | 97e3b24aa661a88c39ab2182162f7010032a7caa (patch) | |
tree | 78d1bff9673e593ce63a1490cbb5d762e56f125a /components/script/script_task.rs | |
parent | d90907cb5f7399196b76b3117e19ff4d1b775a96 (diff) | |
download | servo-97e3b24aa661a88c39ab2182162f7010032a7caa.tar.gz servo-97e3b24aa661a88c39ab2182162f7010032a7caa.zip |
Fix panics in the script_task memory reporter.
These are caused by page_root being empty.
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r-- | components/script/script_task.rs | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 23ab43828e3..faf1f06d202 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1188,23 +1188,26 @@ impl ScriptTask { let mut urls = vec![]; let mut dom_tree_size = 0; let mut reports = vec![]; - for it_page in self.root_page().iter() { - let current_url = it_page.document().url().serialize(); - urls.push(current_url.clone()); - for child in NodeCast::from_ref(&*it_page.document()).traverse_preorder() { - let target = EventTargetCast::from_ref(&*child); + if let Some(root_page) = self.page.borrow().as_ref() { + for it_page in root_page.iter() { + let current_url = it_page.document().url().serialize(); + urls.push(current_url.clone()); + + for child in NodeCast::from_ref(&*it_page.document()).traverse_preorder() { + let target = EventTargetCast::from_ref(&*child); + dom_tree_size += heap_size_of_eventtarget(target); + } + let window = it_page.window(); + let target = EventTargetCast::from_ref(&*window); dom_tree_size += heap_size_of_eventtarget(target); + + reports.push(Report { + path: path![format!("url({})", current_url), "dom-tree"], + kind: ReportKind::ExplicitJemallocHeapSize, + size: dom_tree_size, + }) } - let window = it_page.window(); - let target = EventTargetCast::from_ref(&*window); - dom_tree_size += heap_size_of_eventtarget(target); - - reports.push(Report { - path: path![format!("url({})", current_url), "dom-tree"], - kind: ReportKind::ExplicitJemallocHeapSize, - size: dom_tree_size, - }) } let path_seg = format!("url({})", urls.join(", ")); reports.extend(ScriptTask::get_reports(self.get_cx(), path_seg)); |