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

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.

1 files changed, 9 insertions, 12 deletions

diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index a78108c057a..5775e089c7a 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -817,19 +817,16 @@ impl ScriptTask {
             is a bug.");
         let page = page_tree.page();
 
-        {
-            let mut page_url = page.mut_url();
-            let last_loaded_url = replace(&mut *page_url, None);
-            for loaded in last_loaded_url.iter() {
-                let (ref loaded, needs_reflow) = *loaded;
-                if *loaded == url {
-                    *page_url = Some((loaded.clone(), false));
-                    if needs_reflow {
-                        page.damage(ContentChangedDocumentDamage);
-                        page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor);
-                    }
-                    return;
+        let last_loaded_url = replace(&mut *page.mut_url(), None);
+        for loaded in last_loaded_url.iter() {
+            let (ref loaded, needs_reflow) = *loaded;
+            if *loaded == url {
+                *page.mut_url() = Some((loaded.clone(), false));
+                if needs_reflow {
+                    page.damage(ContentChangedDocumentDamage);
+                    page.reflow(ReflowForDisplay, self.chan.clone(), self.compositor);
                 }
+                return;
             }
         }