Merge master into this branch

1 files changed, 19 insertions, 6 deletions

diff --git a/src/components/script/dom/htmloptgroupelement.rs b/src/components/script/dom/htmloptgroupelement.rs
index 020dd3a2471..d8a3d222cb3 100644
--- a/src/components/script/dom/htmloptgroupelement.rs
+++ b/src/components/script/dom/htmloptgroupelement.rs
@@ -3,27 +3,40 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use dom::bindings::codegen::HTMLOptGroupElementBinding;
+use dom::bindings::codegen::InheritTypes::HTMLOptGroupElementDerived;
+use dom::bindings::js::JS;
 use dom::bindings::utils::ErrorResult;
-use dom::document::AbstractDocument;
+use dom::document::Document;
 use dom::element::HTMLOptGroupElementTypeId;
+use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::htmlelement::HTMLElement;
-use dom::node::{AbstractNode, Node};
+use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
+#[deriving(Encodable)]
 pub struct HTMLOptGroupElement {
     htmlelement: HTMLElement
 }
 
+impl HTMLOptGroupElementDerived for EventTarget {
+    fn is_htmloptgroupelement(&self) -> bool {
+        match self.type_id {
+            NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId)) => true,
+            _ => false
+        }
+    }
+}
+
 impl HTMLOptGroupElement {
-    pub fn new_inherited(localName: DOMString, document: AbstractDocument) -> HTMLOptGroupElement {
+    pub fn new_inherited(localName: DOMString, document: JS<Document>) -> HTMLOptGroupElement {
         HTMLOptGroupElement {
             htmlelement: HTMLElement::new_inherited(HTMLOptGroupElementTypeId, localName, document)
         }
     }
 
-    pub fn new(localName: DOMString, document: AbstractDocument) -> AbstractNode {
-        let element = HTMLOptGroupElement::new_inherited(localName, document);
-        Node::reflect_node(@mut element, document, HTMLOptGroupElementBinding::Wrap)
+    pub fn new(localName: DOMString, document: &JS<Document>) -> JS<HTMLOptGroupElement> {
+        let element = HTMLOptGroupElement::new_inherited(localName, document.clone());
+        Node::reflect_node(~element, document, HTMLOptGroupElementBinding::Wrap)
     }
 }