diff options
| author | Tim Taubert <tim@timtaubert.de> | 2014-10-12 12:46:29 +0200 |
|---|---|---|
| committer | Tim Taubert <tim@timtaubert.de> | 2014-10-13 13:19:05 +0200 |
| commit | e15f8cb37f4c0c867ab237f06678fb33e903dee3 (patch) | |
| tree | b7e193a6c00b1dafaea8015cf6c989da101c0ffa | |
| parent | 78fef7eec5b6f29396f6ffdcb08826173a3742f8 (diff) | |
| download | servo-e15f8cb37f4c0c867ab237f06678fb33e903dee3.tar.gz servo-e15f8cb37f4c0c867ab237f06678fb33e903dee3.zip | |
Privatize Comment
| -rw-r--r-- | components/script/dom/comment.rs | 8 | ||||
| -rw-r--r-- | components/script/dom/htmlserializer.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/node.rs | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs index a2c3c84a6a8..335b9744138 100644 --- 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 index c6f5252f3df..aab4c8d922d 100644 --- 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 index 3ca5515aeb9..3f657b2a755 100644 --- 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 => { |