aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs16
1 files changed, 4 insertions, 12 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 17259132eb6..214d666d636 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -27,8 +27,7 @@ use dom::node::{ElementNodeTypeId, Node, NodeHelpers};
use dom::window::{Window, WindowHelpers};
use dom::worker::{Worker, TrustedWorkerAddress};
use dom::xmlhttprequest::{TrustedXHRAddress, XMLHttpRequest, XHRProgress};
-use html::hubbub_html_parser::{InputString, InputUrl, HtmlParserResult, HtmlDiscoveredScript};
-use html::hubbub_html_parser;
+use parse::html::{InputString, InputUrl, HtmlParserResult, HtmlDiscoveredScript, parse_html};
use layout_interface::{ScriptLayoutChan, LayoutChan, ReflowForDisplay};
use layout_interface;
use page::{Page, IterablePage, Frame};
@@ -781,16 +780,9 @@ impl ScriptTask {
// Parse HTML.
//
// Note: We can parse the next document in parallel with any previous documents.
- let html_parsing_result =
- hubbub_html_parser::parse_html(&*page,
- *document,
- parser_input,
- self.resource_task.clone(),
- Some(load_data));
-
- let HtmlParserResult {
- discovery_port
- } = html_parsing_result;
+ let HtmlParserResult { discovery_port }
+ = parse_html(&*page, *document, parser_input, self.resource_task.clone(),
+ Some(load_data));
{
// Create the root frame.