Merge pull request #3503 from Ms2ger/page-url

Simplify the Page URL handling in handle_resize_inactive_msg.

Reviewed-by: jdm
This commit is contained in:
bors-servo 2014-09-27 13:39:27 -06:00
commit 1b5fac5bde

View file

@ -651,10 +651,9 @@ impl ScriptTask {
let page = page.find(id).expect("Received resize message for PipelineId not associated let page = page.find(id).expect("Received resize message for PipelineId not associated
with a page in the page tree. This is a bug."); with a page in the page tree. This is a bug.");
page.window_size.deref().set(new_size); page.window_size.deref().set(new_size);
let mut page_url = page.mut_url(); match &mut *page.mut_url() {
let last_loaded_url = replace(&mut *page_url, None); &Some((_, ref mut needs_reflow)) => *needs_reflow = true,
for url in last_loaded_url.iter() { &None => (),
*page_url = Some((url.ref0().clone(), true));
} }
} }