Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 23:28:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite Comment::new to current standards.

Browse source
This commit is contained in:
Ms2ger 2013-11-02 22:10:07 +01:00
parent da37fde44f
commit a431202989
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/comment.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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::bindings::utils::{DOMString, Fallible, null_str_as_empty};
use dom::characterdata::CharacterData; use dom::characterdata::CharacterData;
use dom::document::AbstractDocument; use dom::document::AbstractDocument;
@ -14,17 +15,18 @@ pub struct Comment {
} }
impl Comment { impl Comment {
/// Creates a new HTML comment. pub fn new_inherited(text: ~str, document: AbstractDocument) -> Comment {
pub fn new(text: ~str, document: AbstractDocument) -> Comment {
Comment { Comment {
element: CharacterData::new(CommentNodeTypeId, text, document) 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>> { pub fn Constructor(owner: @mut Window, data: &DOMString) -> Fallible<AbstractNode<ScriptView>> {
let s = null_str_as_empty(data); Ok(Comment::new(null_str_as_empty(data), owner.Document()))
let cx = owner.get_cx();
let comment = @Comment::new(s, owner.Document());
Ok(unsafe { Node::as_abstract_node(cx, comment) })
} }
} }

4
src/components/script/dom/document.rs
View file

@ -254,9 +254,7 @@ impl Document {
} }
pub fn CreateComment(&self, abstract_self: AbstractDocument, data: &DOMString) -> AbstractNode<ScriptView> { pub fn CreateComment(&self, abstract_self: AbstractDocument, data: &DOMString) -> AbstractNode<ScriptView> {
let cx = self.get_cx(); Comment::new(null_str_as_word_null(data), abstract_self)
let comment = @Comment::new(null_str_as_word_null(data), abstract_self);
unsafe { Node::as_abstract_node(cx, comment) }
} }
pub fn Title(&self, _: AbstractDocument) -> DOMString { pub fn Title(&self, _: AbstractDocument) -> DOMString {

8
src/components/script/html/hubbub_html_parser.rs
View file

@ -8,7 +8,7 @@ use dom::htmlelement::HTMLElement;
use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6}; use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6};
use dom::htmliframeelement::IFrameSize; use dom::htmliframeelement::IFrameSize;
use dom::htmlformelement::HTMLFormElement; use dom::htmlformelement::HTMLFormElement;
use dom::node::{AbstractNode, ElementNodeTypeId, Node, ScriptView}; use dom::node::{AbstractNode, ElementNodeTypeId, ScriptView};
use dom::types::*; use dom::types::*;
use html::cssparse::{InlineProvenance, StylesheetProvenance, UrlProvenance, spawn_css_parser}; use html::cssparse::{InlineProvenance, StylesheetProvenance, UrlProvenance, spawn_css_parser};
use js::jsapi::JSContext; use js::jsapi::JSContext;
@ -314,10 +314,8 @@ pub fn parse_html(cx: *JSContext,
parser.set_tree_handler(~hubbub::TreeHandler { parser.set_tree_handler(~hubbub::TreeHandler {
create_comment: |data: ~str| { create_comment: |data: ~str| {
debug!("create comment"); debug!("create comment");
let comment = @Comment::new(data, document); let comment = Comment::new(data, document);
unsafe { unsafe { comment.to_hubbub_node() }
Node::as_abstract_node(cx, comment).to_hubbub_node()
}
}, },
create_doctype: |doctype: ~hubbub::Doctype| { create_doctype: |doctype: ~hubbub::Doctype| {
debug!("create doctype"); debug!("create doctype");