Bump html5ever to 0.2.4, <template> support!

The failing <img> test comes from the now-correct parsing of <font face> elements
in SVG.

components/script/dom/document.rs

@@ -155,6 +155,9 @@ pub struct Document {
     reflow_timeout: Cell<Option<u64>>,
     /// The cached first `base` element with an `href` attribute.
     base_element: MutNullableHeap<JS<HTMLBaseElement>>,
+    /// This field is set to the document itself for inert documents.
+    /// https://html.spec.whatwg.org/multipage/#appropriate-template-contents-owner-document
+    appropriate_template_contents_owner_document: MutNullableHeap<JS<Document>>,
 }
 
 impl PartialEq for Document {
@@ -1058,6 +1061,7 @@ impl Document {
             current_parser: Default::default(),
             reflow_timeout: Cell::new(None),
             base_element: Default::default(),
+            appropriate_template_contents_owner_document: Default::default(),
         }
     }
 
@@ -1106,6 +1110,23 @@ impl Document {
             .and_then(HTMLHtmlElementCast::to_ref)
             .map(Root::from_ref)
     }
+
+    /// https://html.spec.whatwg.org/multipage/#appropriate-template-contents-owner-document
+    pub fn appropriate_template_contents_owner_document(&self) -> Root<Document> {
+        self.appropriate_template_contents_owner_document.or_init(|| {
+            let doctype = if self.is_html_document {
+                IsHTMLDocument::HTMLDocument
+            } else {
+                IsHTMLDocument::NonHTMLDocument
+            };
+            let new_doc = Document::new(
+                &*self.window(), None, doctype, None, None,
+                DocumentSource::NotFromParser, DocumentLoader::new(&self.loader()));
+            new_doc.appropriate_template_contents_owner_document.set(
+                Some(JS::from_ref(&*new_doc)));
+            new_doc
+        })
+    }
 }
 
 

components/script/dom/htmltemplateelement.rs

@@ -2,19 +2,25 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
 use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding;
+use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateElementMethods;
 use dom::bindings::codegen::InheritTypes::HTMLTemplateElementDerived;
-use dom::bindings::js::Root;
+use dom::bindings::js::{JS, MutNullableHeap, Root};
 use dom::document::Document;
+use dom::documentfragment::DocumentFragment;
 use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
-use dom::node::{Node, NodeTypeId};
+use dom::node::{Node, NodeTypeId, document_from_node};
 use util::str::DOMString;
 
 #[dom_struct]
 pub struct HTMLTemplateElement {
     htmlelement: HTMLElement,
+
+    /// https://html.spec.whatwg.org/multipage/#template-contents
+    contents: MutNullableHeap<JS<DocumentFragment>>,
 }
 
 impl HTMLTemplateElementDerived for EventTarget {
@@ -31,7 +37,8 @@ impl HTMLTemplateElement {
                      document: &Document) -> HTMLTemplateElement {
         HTMLTemplateElement {
             htmlelement:
-                HTMLElement::new_inherited(HTMLElementTypeId::HTMLTemplateElement, localName, prefix, document)
+                HTMLElement::new_inherited(HTMLElementTypeId::HTMLTemplateElement, localName, prefix, document),
+            contents: MutNullableHeap::new(None),
         }
     }
 
@@ -43,3 +50,13 @@ impl HTMLTemplateElement {
         Node::reflect_node(box element, document, HTMLTemplateElementBinding::Wrap)
     }
 }
+
+impl HTMLTemplateElementMethods for HTMLTemplateElement {
+    /// https://html.spec.whatwg.org/multipage/#dom-template-content
+    fn Content(&self) -> Root<DocumentFragment> {
+        self.contents.or_init(|| {
+            let doc = document_from_node(self);
+            doc.appropriate_template_contents_owner_document().CreateDocumentFragment()
+        })
+    }
+}

components/script/dom/webidls/HTMLTemplateElement.webidl

@@ -5,5 +5,5 @@
 
 // https://www.whatwg.org/html/#htmltemplateelement
 interface HTMLTemplateElement : HTMLElement {
-  //readonly attribute DocumentFragment content;
+  readonly attribute DocumentFragment content;
 };

components/script/parse/html.rs

@@ -6,11 +6,12 @@
 
 use document_loader::DocumentLoader;
 use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
+use dom::bindings::codegen::Bindings::HTMLTemplateElementBinding::HTMLTemplateElementMethods;
 use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
-use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast;
 use dom::bindings::codegen::InheritTypes::{CharacterDataCast, DocumentTypeCast};
-use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLScriptElementCast};
-use dom::bindings::codegen::InheritTypes::{HTMLFormElementDerived, NodeCast};
+use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFormElementDerived};
+use dom::bindings::codegen::InheritTypes::{HTMLScriptElementCast, HTMLTemplateElementCast};
+use dom::bindings::codegen::InheritTypes::{NodeCast, ProcessingInstructionCast};
 use dom::bindings::js::{JS, Root};
 use dom::bindings::js::{RootedReference};
 use dom::characterdata::CharacterDataTypeId;
@@ -43,12 +44,20 @@ use util::str::DOMString;
 
 impl<'a> TreeSink for servohtmlparser::Sink {
     type Handle = JS<Node>;
+
     fn get_document(&mut self) -> JS<Node> {
         let doc = self.document.root();
         let node = NodeCast::from_ref(doc.r());
         JS::from_ref(node)
     }
 
+    fn get_template_contents(&self, target: JS<Node>) -> JS<Node> {
+        let target = target.root();
+        let template = HTMLTemplateElementCast::to_ref(&*target)
+            .expect("tried to get template contents of non-HTMLTemplateElement in HTML parsing");
+        JS::from_ref(NodeCast::from_ref(&*template.Content()))
+    }
+
     fn same_node(&self, x: JS<Node>, y: JS<Node>) -> bool {
         x == y
     }