auto merge of #3973 : Manishearth/servo/301-fix, r=jdm

components/compositing/compositor_task.rs

@@ -25,7 +25,6 @@ use servo_util::time::TimeProfilerChan;
 use std::comm::{channel, Sender, Receiver};
 use std::fmt::{FormatError, Formatter, Show};
 use std::rc::Rc;
-use url::Url;
 
 /// Sends messages to the compositor. This is a trait supplied by the port because the method used
 /// to communicate with the compositor may have to kick OS event loops awake, communicate cross-
@@ -191,8 +190,8 @@ pub enum Msg {
     SetIds(SendableFrameTree, Sender<()>, ConstellationChan),
     /// Sends an updated version of the frame tree.
     FrameTreeUpdateMsg(FrameTreeDiff, Sender<()>),
-    /// The load of a page for a given URL has completed.
-    LoadComplete(PipelineId, Url),
+    /// The load of a page has completed.
+    LoadComplete,
     /// Indicates that the scrolling timeout with the given starting timestamp has happened and a
     /// composite should happen. (See the `scrolling` module.)
     ScrollTimeout(u64),
@@ -214,7 +213,7 @@ impl Show for Msg {
             RenderMsgDiscarded(..) => write!(f, "RenderMsgDiscarded"),
             SetIds(..) => write!(f, "SetIds"),
             FrameTreeUpdateMsg(..) => write!(f, "FrameTreeUpdateMsg"),
-            LoadComplete(..) => write!(f, "LoadComplete"),
+            LoadComplete => write!(f, "LoadComplete"),
             ScrollTimeout(..) => write!(f, "ScrollTimeout"),
         }
     }

components/compositing/constellation.rs

@@ -434,9 +434,9 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
             }
             // A page loaded through one of several methods above has completed all parsing,
             // script, and reflow messages have been sent.
-            LoadCompleteMsg(pipeline_id, url) => {
+            LoadCompleteMsg => {
                 debug!("constellation got load complete message");
-                self.compositor_proxy.send(LoadComplete(pipeline_id, url));
+                self.compositor_proxy.send(LoadComplete);
             }
             // Handle a forward or back request
             NavigateMsg(direction) => {

components/compositing/headless.rs

@@ -104,7 +104,7 @@ impl CompositorEventListener for NullCompositor {
             CreateOrUpdateDescendantLayer(..) |
             SetLayerOrigin(..) | Paint(..) |
             ChangeReadyState(..) | ChangeRenderState(..) | ScrollFragmentPoint(..) |
-            LoadComplete(..) | RenderMsgDiscarded(..) | ScrollTimeout(..) => ()
+            LoadComplete | RenderMsgDiscarded(..) | ScrollTimeout(..) => ()
         }
         true
     }

components/msg/constellation_msg.rs

@@ -197,7 +197,7 @@ pub enum Msg {
     ExitMsg,
     FailureMsg(Failure),
     InitLoadUrlMsg(Url),
-    LoadCompleteMsg(PipelineId, Url),
+    LoadCompleteMsg,
     FrameRectMsg(PipelineId, SubpageId, Rect<f32>),
     LoadUrlMsg(PipelineId, LoadData),
     ScriptLoadedURLInIFrameMsg(Url, PipelineId, SubpageId, IFrameSandboxState),

components/script/script_task.rs

@@ -751,7 +751,7 @@ impl ScriptTask {
     /// The entry point to document loading. Defines bindings, sets up the window and document
     /// objects, parses HTML and CSS, and kicks off initial layout.
     fn load(&self, pipeline_id: PipelineId, load_data: LoadData) {
-        let url = load_data.url.clone();
+        let mut url = load_data.url.clone();
         debug!("ScriptTask: loading {} on page {}", url, pipeline_id);
 
         let page = self.page.borrow_mut();
@@ -818,6 +818,7 @@ impl ScriptTask {
         }
 
         parse_html(&*page, *document, parser_input, self.resource_task.clone(), Some(load_data));
+        url = page.get_url().clone();
 
         document.set_ready_state(DocumentReadyStateValues::Interactive);
 
@@ -853,10 +854,10 @@ impl ScriptTask {
         let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window);
         let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event);
 
-        *page.fragment_name.borrow_mut() = url.fragment.clone();
+        *page.fragment_name.borrow_mut() = url.fragment;
 
         let ConstellationChan(ref chan) = self.constellation_chan;
-        chan.send(LoadCompleteMsg(page.id, url));
+        chan.send(LoadCompleteMsg);
     }
 
     fn scroll_fragment_point(&self, pipeline_id: PipelineId, node: JSRef<Element>) {