Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4403 : pcwalton/servo/back-borrow, r=jdm

Browse source 
I have verified that back and forward work once again.

Sorry about this one. r? @jdm
This commit is contained in:
bors-servo 2014-12-18 14:39:50 -07:00
commit 8626be6ab0
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/script_task.rs
View file

@ -729,15 +729,24 @@ impl ScriptTask {
message for a layout channel that is not associated with this script task. This message for a layout channel that is not associated with this script task. This
is a bug."); is a bug.");
let last_url = match &mut *page.mut_url() { // Are we reloading?
&Some((ref mut loaded, ref mut needs_reflow)) if *loaded == url => { let reloading = match *page.url() {
if replace(needs_reflow, false) { Some((ref loaded, _)) => *loaded == url,
_ => false,
};
if reloading {
// Pull out the `needs_reflow` flag explicitly because `reflow` can ask for the page's
// URL, and we can't be holding a borrow on that URL (#4402).
let needed_reflow = match &mut *page.mut_url() {
&Some((_, ref mut needs_reflow)) => replace(needs_reflow, false),
_ => panic!("can't reload a page with no URL!")
};
if needed_reflow {
self.force_reflow(&*page); self.force_reflow(&*page);
} }
return; return
}, }
url => replace(url, None).map(|(loaded, _)| loaded), let last_url = replace(&mut *page.mut_url(), None).map(|(last_url, _)| last_url);
};
let is_javascript = url.scheme.as_slice() == "javascript"; let is_javascript = url.scheme.as_slice() == "javascript";