auto merge of #4405 : servo/servo/rustup_20141124, r=jdm

1 files changed, 5 insertions, 5 deletions

diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 3cc03a64d1c..09473d017b5 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -6,10 +6,10 @@ use dom::bindings::js::{JSRef};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::bindings::codegen::InheritTypes::HTMLMediaElementDerived;
 use dom::document::Document;
-use dom::element::{ElementTypeId, HTMLAudioElementTypeId, HTMLVideoElementTypeId};
-use dom::eventtarget::{EventTarget, NodeTargetTypeId};
+use dom::element::ElementTypeId;
+use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlelement::HTMLElement;
-use dom::node::ElementNodeTypeId;
+use dom::node::NodeTypeId;
 use servo_util::str::DOMString;
 
 #[dom_struct]
@@ -20,8 +20,8 @@ pub struct HTMLMediaElement {
 impl HTMLMediaElementDerived for EventTarget {
     fn is_htmlmediaelement(&self) -> bool {
         match *self.type_id() {
-            NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) |
-            NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) => true,
+            EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLVideoElement)) |
+            EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLAudioElement)) => true,
             _ => false
         }
     }