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

Reuse the final_url in ScriptTask::load.

Browse source 
In both the javascript and non-javascript url cases, final_url is set to the
same url as is stored by the Page.
This commit is contained in:
Ms2ger 2014-12-09 15:14:58 +01:00
parent 795327d5c4
commit 64b0a6b0b4
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/script_task.rs
View file

@ -690,7 +690,7 @@ impl ScriptTask {
/// The entry point to document loading. Defines bindings, sets up the window and document /// The entry point to document loading. Defines bindings, sets up the window and document
/// objects, parses HTML and CSS, and kicks off initial layout. /// objects, parses HTML and CSS, and kicks off initial layout.
fn load(&self, pipeline_id: PipelineId, load_data: LoadData) { fn load(&self, pipeline_id: PipelineId, load_data: LoadData) {
let mut url = load_data.url.clone(); let url = load_data.url.clone();
debug!("ScriptTask: loading {} on page {}", url, pipeline_id); debug!("ScriptTask: loading {} on page {}", url, pipeline_id);
let page = self.page.borrow_mut(); let page = self.page.borrow_mut();
@ -782,19 +782,18 @@ impl ScriptTask {
}; };
parse_html(*document, parser_input, &final_url); parse_html(*document, parser_input, &final_url);
url = page.get_url().clone();
document.set_ready_state(DocumentReadyStateValues::Interactive); document.set_ready_state(DocumentReadyStateValues::Interactive);
// Kick off the initial reflow of the page. // Kick off the initial reflow of the page.
debug!("kicking off initial reflow of {}", url); debug!("kicking off initial reflow of {}", final_url);
document.content_changed(NodeCast::from_ref(*document)); document.content_changed(NodeCast::from_ref(*document));
window.flush_layout(); window.flush_layout();
{ {
// No more reflow required // No more reflow required
let mut page_url = page.mut_url(); let mut page_url = page.mut_url();
*page_url = Some((url.clone(), false)); *page_url = Some((final_url.clone(), false));
} }
// https://html.spec.whatwg.org/multipage/#the-end step 4 // https://html.spec.whatwg.org/multipage/#the-end step 4
@ -814,7 +813,7 @@ impl ScriptTask {
let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window); let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window);
let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event); let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event);
*page.fragment_name.borrow_mut() = url.fragment; *page.fragment_name.borrow_mut() = final_url.fragment;
let ConstellationChan(ref chan) = self.constellation_chan; let ConstellationChan(ref chan) = self.constellation_chan;
chan.send(LoadCompleteMsg); chan.send(LoadCompleteMsg);