Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2203 : mbrubeck/servo/back-crash, r=jdm

Browse source 
This fixes two `RefCell<T> is already borrowed` failures when reloading an
existing pipeline, both caused by functions trying to modify `Pipeline::url`
or `ScriptTask::url` while a reference to a previous borrow is still in scope.

Note: After applying this patch, there are some painting issues after navigating back.
This commit is contained in:
bors-servo 2014-04-23 14:10:21 -04:00
commit 7326df044c
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/main/pipeline.rs
View file

@ -202,7 +202,8 @@ impl Pipeline {
} }
pub fn reload(&self) { pub fn reload(&self) {
self.url.borrow().clone().map(|url| { let url = self.url.borrow().clone();
url.map(|url| {
self.load(url); self.load(url);
}); });
} }

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

@ -817,19 +817,16 @@ impl ScriptTask {
is a bug."); is a bug.");
let page = page_tree.page(); let page = page_tree.page();
{ let last_loaded_url = replace(&mut *page.mut_url(), None);
let mut page_url = page.mut_url(); for loaded in last_loaded_url.iter() {
let last_loaded_url = replace(&mut *page_url, None); let (ref loaded, needs_reflow) = *loaded;
for loaded in last_loaded_url.iter() { if *loaded == url {
let (ref loaded, needs_reflow) = *loaded; *page.mut_url() = Some((loaded.clone(), false));
if *loaded == url { if needs_reflow {
*page_url = Some((loaded.clone(), false)); page.damage(ContentChangedDocumentDamage);
if needs_reflow { page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor);
page.damage(ContentChangedDocumentDamage);
page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor);
}
return;
} }
return;
} }
} }