auto merge of #4495 : MeghaGupta/servo/typeid, r=Ms2ger

1 files changed, 8 insertions, 8 deletions

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 30099bb1798..8859f5d67bd 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -39,7 +39,7 @@ use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::{EventTarget, EventTargetTypeId, EventTargetHelpers};
 use dom::htmlanchorelement::HTMLAnchorElement;
 use dom::htmlcollection::{HTMLCollection, CollectionFilter};
-use dom::htmlelement::HTMLElement;
+use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::htmlheadelement::HTMLHeadElement;
 use dom::htmlhtmlelement::HTMLHtmlElement;
 use dom::htmltitleelement::HTMLTitleElement;
@@ -768,7 +768,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
         self.GetDocumentElement().root().map(|root| {
             let root: JSRef<Node> = NodeCast::from_ref(root.r());
             root.traverse_preorder()
-                .find(|node| node.type_id() == NodeTypeId::Element(ElementTypeId::HTMLTitleElement))
+                .find(|node| node.type_id() == NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement)))
                 .map(|title_elem| {
                     for text in title_elem.children().filter_map::<JSRef<Text>>(TextCast::to_ref) {
                         title.push_str(text.characterdata().data().as_slice());
@@ -784,11 +784,11 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
         self.GetDocumentElement().root().map(|root| {
             let root: JSRef<Node> = NodeCast::from_ref(root.r());
             let head_node = root.traverse_preorder().find(|child| {
-                child.type_id() == NodeTypeId::Element(ElementTypeId::HTMLHeadElement)
+                child.type_id() == NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadElement))
             });
             head_node.map(|head| {
                 let title_node = head.children().find(|child| {
-                    child.type_id() == NodeTypeId::Element(ElementTypeId::HTMLTitleElement)
+                    child.type_id() == NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement))
                 });
 
                 match title_node {
@@ -833,8 +833,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
             let node: JSRef<Node> = NodeCast::from_ref(root.r());
             node.children().find(|child| {
                 match child.type_id() {
-                    NodeTypeId::Element(ElementTypeId::HTMLBodyElement) |
-                    NodeTypeId::Element(ElementTypeId::HTMLFrameSetElement) => true,
+                    NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement)) |
+                    NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameSetElement)) => true,
                     _ => false
                 }
             }).map(|node| {
@@ -853,8 +853,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
 
         let node: JSRef<Node> = NodeCast::from_ref(new_body);
         match node.type_id() {
-            NodeTypeId::Element(ElementTypeId::HTMLBodyElement) |
-            NodeTypeId::Element(ElementTypeId::HTMLFrameSetElement) => {}
+            NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement)) |
+            NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameSetElement)) => {}
             _ => return Err(HierarchyRequest)
         }