diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-03 19:58:28 -0500 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-03 19:58:28 -0500 |
| commit | 4a6077ca4cb6e2d54e2f558c18f45849c9d3c47d (patch) | |
| tree | 0a726c81c4179f3cc5f059604c481424d89e4306 /src | |
| parent | a30041e9608b041dcf2a46f6b9f5e183817a55ae (diff) | |
| parent | b13a7c73c5f59be6e9c8a2ba4dd1925352dcafb5 (diff) | |
| download | servo-4a6077ca4cb6e2d54e2f558c18f45849c9d3c47d.tar.gz servo-4a6077ca4cb6e2d54e2f558c18f45849c9d3c47d.zip | |
auto merge of #1802 : lpy/servo/issue1801, r=kmcallister
see #1801
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/script/html/hubbub_html_parser.rs | 4 | ||||
| -rw-r--r-- | src/components/script/script_task.rs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index 3c36b70a0ca..67a05c94386 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -248,10 +248,10 @@ pub fn build_element_from_tag(tag: DOMString, document: &JS<Document>) -> JS<Ele pub fn parse_html(page: &Page, document: &mut JS<Document>, url: Url, - resource_task: ResourceTask, - next_subpage_id: SubpageId) + resource_task: ResourceTask) -> HtmlParserResult { debug!("Hubbub: parsing {:?}", url); + let next_subpage_id: SubpageId = page.next_subpage_id.get(); // Spawn a CSS parser to receive links to CSS style sheets. let resource_task2 = resource_task.clone(); diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 95789bd34f7..d6f17e4801c 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -814,8 +814,7 @@ impl ScriptTask { let html_parsing_result = hubbub_html_parser::parse_html(page, &mut document, url.clone(), - self.resource_task.clone(), - page.next_subpage_id.get()); + self.resource_task.clone()); let HtmlParserResult { discovery_port |