Upgrade to html5ever 0.16

1 files changed, 12 insertions, 182 deletions

diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs
index 6142dba20f6..f25e95507e4 100644
--- a/components/script/dom/servoparser/html.rs
+++ b/components/script/dom/servoparser/html.rs
@@ -5,38 +5,28 @@
 #![allow(unrooted_must_root)]
 
 use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateElementMethods;
-use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use dom::bindings::inheritance::{Castable, CharacterDataTypeId, NodeTypeId};
 use dom::bindings::js::{JS, Root};
-use dom::bindings::str::DOMString;
 use dom::bindings::trace::JSTraceable;
 use dom::characterdata::CharacterData;
-use dom::comment::Comment;
 use dom::document::Document;
 use dom::documenttype::DocumentType;
-use dom::element::{Element, ElementCreator};
-use dom::htmlformelement::{FormControlElementHelpers, HTMLFormElement};
+use dom::element::Element;
 use dom::htmlscriptelement::HTMLScriptElement;
 use dom::htmltemplateelement::HTMLTemplateElement;
 use dom::node::Node;
 use dom::processinginstruction::ProcessingInstruction;
-use dom::virtualmethods::vtable_for;
-use html5ever::Attribute;
+use dom::servoparser::Sink;
 use html5ever::QualName;
-use html5ever::serialize::{AttrRef, Serializable, Serializer};
+use html5ever::buffer_queue::BufferQueue;
+use html5ever::serialize::{AttrRef, Serialize, Serializer};
 use html5ever::serialize::TraversalScope;
 use html5ever::serialize::TraversalScope::{ChildrenOnly, IncludeNode};
-use html5ever::tendril::StrTendril;
 use html5ever::tokenizer::{Tokenizer as HtmlTokenizer, TokenizerOpts, TokenizerResult};
-use html5ever::tokenizer::buffer_queue::BufferQueue;
-use html5ever::tree_builder::{NodeOrText, QuirksMode};
-use html5ever::tree_builder::{Tracer as HtmlTracer, TreeBuilder, TreeBuilderOpts, TreeSink};
+use html5ever::tree_builder::{Tracer as HtmlTracer, TreeBuilder, TreeBuilderOpts};
 use js::jsapi::JSTracer;
 use servo_url::ServoUrl;
-use std::ascii::AsciiExt;
-use std::borrow::Cow;
-use std::io::{self, Write};
-use style::context::QuirksMode as ServoQuirksMode;
+use std::io;
 
 #[derive(HeapSizeOf, JSTraceable)]
 #[must_root]
@@ -55,6 +45,7 @@ impl Tokenizer {
             base_url: url,
             document: JS::from_ref(document),
             current_line: 1,
+            script: Default::default(),
         };
 
         let options = TreeBuilderOpts {
@@ -124,179 +115,18 @@ unsafe impl JSTraceable for HtmlTokenizer<TreeBuilder<JS<Node>, Sink>> {
     }
 }
 
-#[derive(JSTraceable, HeapSizeOf)]
-#[must_root]
-struct Sink {
-    base_url: ServoUrl,
-    document: JS<Document>,
-    current_line: u64,
-}
-
-impl TreeSink for Sink {
-    type Output = Self;
-    fn finish(self) -> Self { self }
-
-    type Handle = JS<Node>;
-
-    fn get_document(&mut self) -> JS<Node> {
-        JS::from_ref(self.document.upcast())
-    }
-
-    fn get_template_contents(&mut self, target: JS<Node>) -> JS<Node> {
-        let template = target.downcast::<HTMLTemplateElement>()
-            .expect("tried to get template contents of non-HTMLTemplateElement in HTML parsing");
-        JS::from_ref(template.Content().upcast())
-    }
-
-    fn same_node(&self, x: JS<Node>, y: JS<Node>) -> bool {
-        x == y
-    }
-
-    fn elem_name(&self, target: JS<Node>) -> QualName {
-        let elem = target.downcast::<Element>()
-            .expect("tried to get name of non-Element in HTML parsing");
-        QualName {
-            ns: elem.namespace().clone(),
-            local: elem.local_name().clone(),
-        }
-    }
-
-    fn same_tree(&self, x: JS<Node>, y: JS<Node>) -> bool {
-        let x = x.downcast::<Element>().expect("Element node expected");
-        let y = y.downcast::<Element>().expect("Element node expected");
-
-        x.is_in_same_home_subtree(y)
-    }
-
-    fn create_element(&mut self, name: QualName, attrs: Vec<Attribute>)
-            -> JS<Node> {
-        let elem = Element::create(name, None, &*self.document,
-                                   ElementCreator::ParserCreated(self.current_line));
-
-        for attr in attrs {
-            elem.set_attribute_from_parser(attr.name, DOMString::from(String::from(attr.value)), None);
-        }
-
-        JS::from_ref(elem.upcast())
-    }
-
-    fn create_comment(&mut self, text: StrTendril) -> JS<Node> {
-        let comment = Comment::new(DOMString::from(String::from(text)), &*self.document);
-        JS::from_ref(comment.upcast())
-    }
-
-    fn has_parent_node(&self, node: JS<Node>) -> bool {
-         node.GetParentNode().is_some()
-    }
-
-    fn associate_with_form(&mut self, target: JS<Node>, form: JS<Node>) {
-        let node = target;
-        let form = Root::downcast::<HTMLFormElement>(Root::from_ref(&*form))
-            .expect("Owner must be a form element");
-
-        let elem = node.downcast::<Element>();
-        let control = elem.as_ref().and_then(|e| e.as_maybe_form_control());
-
-        if let Some(control) = control {
-            control.set_form_owner_from_parser(&form);
-        } else {
-            // TODO remove this code when keygen is implemented.
-            assert!(node.NodeName() == "KEYGEN", "Unknown form-associatable element");
-        }
-    }
-
-    fn append_before_sibling(&mut self,
-            sibling: JS<Node>,
-            new_node: NodeOrText<JS<Node>>) {
-        let parent = sibling.GetParentNode()
-            .expect("append_before_sibling called on node without parent");
-
-        super::insert(&parent, Some(&*sibling), new_node);
-    }
-
-    fn parse_error(&mut self, msg: Cow<'static, str>) {
-        debug!("Parse error: {}", msg);
-    }
-
-    fn set_quirks_mode(&mut self, mode: QuirksMode) {
-        let mode = match mode {
-            QuirksMode::Quirks => ServoQuirksMode::Quirks,
-            QuirksMode::LimitedQuirks => ServoQuirksMode::LimitedQuirks,
-            QuirksMode::NoQuirks => ServoQuirksMode::NoQuirks,
-        };
-        self.document.set_quirks_mode(mode);
-    }
-
-    fn append(&mut self, parent: JS<Node>, child: NodeOrText<JS<Node>>) {
-        super::insert(&parent, None, child);
-    }
-
-    fn append_doctype_to_document(&mut self, name: StrTendril, public_id: StrTendril,
-                                  system_id: StrTendril) {
-        let doc = &*self.document;
-        let doctype = DocumentType::new(
-            DOMString::from(String::from(name)), Some(DOMString::from(String::from(public_id))),
-            Some(DOMString::from(String::from(system_id))), doc);
-        doc.upcast::<Node>().AppendChild(doctype.upcast()).expect("Appending failed");
-    }
-
-    fn add_attrs_if_missing(&mut self, target: JS<Node>, attrs: Vec<Attribute>) {
-        let elem = target.downcast::<Element>()
-            .expect("tried to set attrs on non-Element in HTML parsing");
-        for attr in attrs {
-            elem.set_attribute_from_parser(attr.name, DOMString::from(String::from(attr.value)), None);
-        }
-    }
-
-    fn remove_from_parent(&mut self, target: JS<Node>) {
-        if let Some(ref parent) = target.GetParentNode() {
-            parent.RemoveChild(&*target).unwrap();
-        }
-    }
-
-    fn mark_script_already_started(&mut self, node: JS<Node>) {
-        let script = node.downcast::<HTMLScriptElement>();
-        script.map(|script| script.set_already_started(true));
-    }
-
-    fn reparent_children(&mut self, node: JS<Node>, new_parent: JS<Node>) {
-        while let Some(ref child) = node.GetFirstChild() {
-            new_parent.AppendChild(&child).unwrap();
-        }
-    }
-
-    /// https://html.spec.whatwg.org/multipage/#html-integration-point
-    /// Specifically, the <annotation-xml> cases.
-    fn is_mathml_annotation_xml_integration_point(&self, handle: JS<Node>) -> bool {
-        let elem = handle.downcast::<Element>().unwrap();
-        elem.get_attribute(&ns!(), &local_name!("encoding")).map_or(false, |attr| {
-            attr.value().eq_ignore_ascii_case("text/html")
-                || attr.value().eq_ignore_ascii_case("application/xhtml+xml")
-        })
-    }
-
-    fn set_current_line(&mut self, line_number: u64) {
-        self.current_line = line_number;
-    }
-
-    fn pop(&mut self, node: JS<Node>) {
-        let node = Root::from_ref(&*node);
-        vtable_for(&node).pop();
-    }
-}
-
-impl<'a> Serializable for &'a Node {
-    fn serialize<'wr, Wr: Write>(&self, serializer: &mut Serializer<'wr, Wr>,
-                                 traversal_scope: TraversalScope) -> io::Result<()> {
+impl<'a> Serialize for &'a Node {
+    fn serialize<S: Serializer>(&self, serializer: &mut S,
+                                traversal_scope: TraversalScope) -> io::Result<()> {
         let node = *self;
         match (traversal_scope, node.type_id()) {
             (_, NodeTypeId::Element(..)) => {
                 let elem = node.downcast::<Element>().unwrap();
-                let name = QualName::new(elem.namespace().clone(),
+                let name = QualName::new(None, elem.namespace().clone(),
                                          elem.local_name().clone());
                 if traversal_scope == IncludeNode {
                     let attrs = elem.attrs().iter().map(|attr| {
-                        let qname = QualName::new(attr.namespace().clone(),
+                        let qname = QualName::new(None, attr.namespace().clone(),
                                                   attr.local_name().clone());
                         let value = attr.value().clone();
                         (qname, value)