Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Privatize Comment

Browse source
This commit is contained in:
Tim Taubert 2014-10-12 12:46:29 +02:00
parent 78fef7eec5
commit e15f8cb37f
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/comment.rs
View file

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

2
components/script/dom/htmlserializer.rs
View file

@ -69,7 +69,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> String {
fn serialize_comment(comment: JSRef<Comment>, html: &mut String) { fn serialize_comment(comment: JSRef<Comment>, html: &mut String) {
html.push_str("<!--"); html.push_str("<!--");
html.push_str(comment.characterdata.data().as_slice()); html.push_str(comment.characterdata().data().as_slice());
html.push_str("-->"); html.push_str("-->");
} }

2
components/script/dom/node.rs
View file

@ -1469,7 +1469,7 @@ impl Node {
}, },
CommentNodeTypeId => { CommentNodeTypeId => {
let comment: JSRef<Comment> = CommentCast::to_ref(node).unwrap(); 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) NodeCast::from_temporary(comment)
}, },
DocumentNodeTypeId => { DocumentNodeTypeId => {