From f85b9e37cc121544bd4c2ebe434e717eb3a3d953 Mon Sep 17 00:00:00 2001
From: Megha Gupta <meghabloomgirl@gmail.com>
Date: Sun, 28 Dec 2014 15:44:03 +0530
Subject: Add HTMLElementTypeId enum (fixes #3625)

---
 components/script/dom/htmlaudioelement.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'components/script/dom/htmlaudioelement.rs')

diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs
index 20da3756e1f..4d40834c999 100644
--- a/components/script/dom/htmlaudioelement.rs
+++ b/components/script/dom/htmlaudioelement.rs
@@ -9,6 +9,7 @@ use dom::document::Document;
 use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlmediaelement::HTMLMediaElement;
+use dom::htmlelement::HTMLElementTypeId;
 use dom::node::{Node, NodeTypeId};
 use servo_util::str::DOMString;
 
@@ -19,14 +20,14 @@ pub struct HTMLAudioElement {
 
 impl HTMLAudioElementDerived for EventTarget {
     fn is_htmlaudioelement(&self) -> bool {
-        *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLAudioElement))
+        *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAudioElement)))
     }
 }
 
 impl HTMLAudioElement {
     fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLAudioElement {
         HTMLAudioElement {
-            htmlmediaelement: HTMLMediaElement::new_inherited(ElementTypeId::HTMLAudioElement, localName, prefix, document)
+            htmlmediaelement: HTMLMediaElement::new_inherited(HTMLElementTypeId::HTMLAudioElement, localName, prefix, document)
         }
     }
 
-- 
cgit v1.2.3


From 50310968536c615f1331f3dc8b2b1352230816ee Mon Sep 17 00:00:00 2001
From: Megha Gupta <meghabloomgirl@gmail.com>
Date: Tue, 30 Dec 2014 19:49:02 +0530
Subject: Fix inheritance enums for htmlmediaelement and htmltablecellelement

---
 components/script/dom/htmlaudioelement.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'components/script/dom/htmlaudioelement.rs')

diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs
index 4d40834c999..36419faf54e 100644
--- a/components/script/dom/htmlaudioelement.rs
+++ b/components/script/dom/htmlaudioelement.rs
@@ -8,8 +8,8 @@ use dom::bindings::js::{JSRef, Temporary};
 use dom::document::Document;
 use dom::element::ElementTypeId;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
-use dom::htmlmediaelement::HTMLMediaElement;
 use dom::htmlelement::HTMLElementTypeId;
+use dom::htmlmediaelement::{HTMLMediaElement, HTMLMediaElementTypeId};
 use dom::node::{Node, NodeTypeId};
 use servo_util::str::DOMString;
 
@@ -20,14 +20,17 @@ pub struct HTMLAudioElement {
 
 impl HTMLAudioElementDerived for EventTarget {
     fn is_htmlaudioelement(&self) -> bool {
-        *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAudioElement)))
+        *self.type_id() == EventTargetTypeId::Node(NodeTypeId::Element(
+                                                   ElementTypeId::HTMLElement(
+                                                   HTMLElementTypeId::HTMLMediaElement(
+                                                   HTMLMediaElementTypeId::HTMLAudioElement))))
     }
 }
 
 impl HTMLAudioElement {
     fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLAudioElement {
         HTMLAudioElement {
-            htmlmediaelement: HTMLMediaElement::new_inherited(HTMLElementTypeId::HTMLAudioElement, localName, prefix, document)
+            htmlmediaelement: HTMLMediaElement::new_inherited(HTMLMediaElementTypeId::HTMLAudioElement, localName, prefix, document)
         }
     }
 
-- 
cgit v1.2.3