Use `parse_html` in DOMParser.

2 files changed, 12 insertions, 10 deletions

diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs
index 91d340aa791..601af0493a3 100644
--- a/components/script/dom/domparser.rs
+++ b/components/script/dom/domparser.rs
@@ -14,9 +14,8 @@ use dom::bindings::js::{JS, JSRef, Temporary};
 use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object};
 use dom::document::{Document, DocumentHelpers, IsHTMLDocument};
 use dom::document::DocumentSource;
-use dom::servohtmlparser::ServoHTMLParser;
 use dom::window::Window;
-use parse::Parser;
+use parse::html::{HTMLInput, parse_html};
 use servo_util::str::DOMString;
 
 #[dom_struct]
@@ -50,23 +49,21 @@ impl<'a> DOMParserMethods for JSRef<'a, DOMParser> {
                        ty: DOMParserBinding::SupportedType)
                        -> Fallible<Temporary<Document>> {
         let window = self.window.root().clone();
-        let url = Some(window.get_url());
+        let url = window.get_url();
         let content_type = DOMParserBinding::SupportedTypeValues::strings[ty as uint].to_string();
         match ty {
             Text_html => {
-                let document = Document::new(window, url.clone(),
+                let document = Document::new(window, Some(url.clone()),
                                              IsHTMLDocument::HTMLDocument,
                                              Some(content_type),
                                              DocumentSource::FromParser).root().clone();
-                let parser = ServoHTMLParser::new(url.clone(), document).root().clone();
-                parser.parse_chunk(s);
-                parser.finish();
+                parse_html(document, HTMLInput::InputString(s), &url);
                 document.set_ready_state(DocumentReadyState::Complete);
                 Ok(Temporary::from_rooted(document))
             }
             Text_xml => {
                 //FIXME: this should probably be FromParser when we actually parse the string (#3756).
-                Ok(Document::new(window, url.clone(),
+                Ok(Document::new(window, Some(url.clone()),
                                  IsHTMLDocument::NonHTMLDocument,
                                  Some(content_type),
                                  DocumentSource::NotFromParser))
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index 99d23e33674..ab30802d16e 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -168,7 +168,10 @@ pub fn parse_html(document: JSRef<Document>,
     let parser = ServoHTMLParser::new(Some(url.clone()), document).root();
     let parser: JSRef<ServoHTMLParser> = *parser;
 
-    task_state::enter(IN_HTML_PARSER);
+    let nested_parse = task_state::get().contains(task_state::IN_HTML_PARSER);
+    if !nested_parse {
+        task_state::enter(IN_HTML_PARSER);
+    }
 
     match input {
         HTMLInput::InputString(s) => {
@@ -201,7 +204,9 @@ pub fn parse_html(document: JSRef<Document>,
 
     parser.finish();
 
-    task_state::exit(IN_HTML_PARSER);
+    if !nested_parse {
+        task_state::exit(IN_HTML_PARSER);
+    }
 
     debug!("finished parsing");
 }