Remove next_subpage_id argument from parse_html.(fixes #1801)

servo · Mar 4, 2014 · b13a7c7 · b13a7c7 · bors-servo · Mar 4, 2014
1 parent a30041e
commit b13a7c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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