Privatize Comment

servo · Oct 13, 2014 · e15f8cb · e15f8cb
1 parent 78fef7e
commit e15f8cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs
@@ -18,8 +18,9 @@ use servo_util::str::DOMString;
 /// An HTML comment.
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Comment {
-    pub characterdata: CharacterData,
+    characterdata: CharacterData,
 }
 
 impl CommentDerived for EventTarget {
@@ -44,6 +45,11 @@ impl Comment {
         let document = global.as_window().Document().root();
         Ok(Comment::new(data, *document))
     }
+
+    #[inline]
+    pub fn characterdata<'a>(&'a self) -> &'a CharacterData {
+        &self.characterdata
+    }
 }
 
 impl Reflectable for Comment {

diff --git a/components/script/dom/htmlserializer.rs b/components/script/dom/htmlserializer.rs
@@ -69,7 +69,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> String {
 
 fn serialize_comment(comment: JSRef<Comment>, html: &mut String) {
     html.push_str("<!--");
-    html.push_str(comment.characterdata.data().as_slice());
+    html.push_str(comment.characterdata().data().as_slice());
     html.push_str("-->");
 }
 

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
@@ -1469,7 +1469,7 @@ impl Node {
             },
             CommentNodeTypeId => {
                 let comment: JSRef<Comment> = CommentCast::to_ref(node).unwrap();
-                let comment = Comment::new(comment.characterdata.data().clone(), *document);
+                let comment = Comment::new(comment.characterdata().data().clone(), *document);
                 NodeCast::from_temporary(comment)
             },
             DocumentNodeTypeId => {