3 files changed, 12 insertions, 14 deletions
diff --git a/src/components/script/dom/comment.rs b/src/components/script/dom/comment.rs
index 7d628434894..bd238af7b50 100644
--- a/src/components/script/dom/comment.rs
+++ b/src/components/script/dom/comment.rs
@@ -2,6 +2,7 @@
  * 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::CommentBinding;
 use dom::bindings::utils::{DOMString, Fallible, null_str_as_empty};
 use dom::characterdata::CharacterData;
 use dom::document::AbstractDocument;
@@ -14,17 +15,18 @@ pub struct Comment {
 }
 
 impl Comment {
-    /// Creates a new HTML comment.
-    pub fn new(text: ~str, document: AbstractDocument) -> Comment {
+    pub fn new_inherited(text: ~str, document: AbstractDocument) -> Comment {
         Comment {
             element: CharacterData::new(CommentNodeTypeId, text, document)
         }
     }
 
+    pub fn new(text: ~str, document: AbstractDocument) -> AbstractNode<ScriptView> {
+        let node = Comment::new_inherited(text, document);
+        Node::reflect_node(@mut node, document, CommentBinding::Wrap)
+    }
+
     pub fn Constructor(owner: @mut Window, data: &DOMString) -> Fallible<AbstractNode<ScriptView>> {
-        let s = null_str_as_empty(data);
-        let cx = owner.get_cx();
-        let comment = @Comment::new(s, owner.Document());
-        Ok(unsafe { Node::as_abstract_node(cx, comment) })
+        Ok(Comment::new(null_str_as_empty(data), owner.Document()))
     }
 }
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index 32ea8cab74f..1c50c397cf7 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -254,9 +254,7 @@ impl Document {
     }
 
     pub fn CreateComment(&self, abstract_self: AbstractDocument, data: &DOMString) -> AbstractNode<ScriptView> {
-        let cx = self.get_cx();
-        let comment = @Comment::new(null_str_as_word_null(data), abstract_self);
-        unsafe { Node::as_abstract_node(cx, comment) }
+        Comment::new(null_str_as_word_null(data), abstract_self)
     }
 
     pub fn Title(&self, _: AbstractDocument) -> DOMString {
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 155b60ccf85..07f5fb7f0df 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -8,7 +8,7 @@ use dom::htmlelement::HTMLElement;
 use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6};
 use dom::htmliframeelement::IFrameSize;
 use dom::htmlformelement::HTMLFormElement;
-use dom::node::{AbstractNode, ElementNodeTypeId, Node, ScriptView};
+use dom::node::{AbstractNode, ElementNodeTypeId, ScriptView};
 use dom::types::*;
 use html::cssparse::{InlineProvenance, StylesheetProvenance, UrlProvenance, spawn_css_parser};
 use js::jsapi::JSContext;
@@ -314,10 +314,8 @@ pub fn parse_html(cx: *JSContext,
     parser.set_tree_handler(~hubbub::TreeHandler {
         create_comment: |data: ~str| {
             debug!("create comment");
-            let comment = @Comment::new(data, document);
-            unsafe {
-                Node::as_abstract_node(cx, comment).to_hubbub_node()
-            }
+            let comment = Comment::new(data, document);
+            unsafe { comment.to_hubbub_node() }
         },
         create_doctype: |doctype: ~hubbub::Doctype| {
             debug!("create doctype");