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

Remove some type variables and an explicit dereference.

Browse source
This commit is contained in:
Ms2ger 2013-10-12 16:08:45 +02:00
parent 438d121cd8
commit f4edbb6b2e
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/script/dom/bindings/codegen/Bindings.conf
View file

@ -574,7 +574,7 @@ def addHTMLElement(element, concrete=None, needsAbstract=[]):
} }
addHTMLElement('Comment') addHTMLElement('Comment')
addHTMLElement('DocumentFragment', concrete='DocumentFragment<ScriptView>') addHTMLElement('DocumentFragment', concrete='DocumentFragment')
addHTMLElement('DocumentType', concrete='DocumentType<ScriptView>') addHTMLElement('DocumentType', concrete='DocumentType<ScriptView>')
addHTMLElement('Text') addHTMLElement('Text')

6
src/components/script/dom/bindings/element.rs
View file

@ -129,9 +129,9 @@ macro_rules! generate_traceable_node(
generate_cacheable_wrapper!(Comment, CommentBinding::Wrap) generate_cacheable_wrapper!(Comment, CommentBinding::Wrap)
generate_binding_object!(Comment) generate_binding_object!(Comment)
generate_traceable!(Comment) generate_traceable!(Comment)
generate_cacheable_wrapper_node!(DocumentFragment<ScriptView>, DocumentFragmentBinding::Wrap) generate_cacheable_wrapper_node!(DocumentFragment, DocumentFragmentBinding::Wrap)
generate_binding_object_node!(DocumentFragment<ScriptView>) generate_binding_object_node!(DocumentFragment)
generate_traceable_node!(DocumentFragment<ScriptView>) generate_traceable_node!(DocumentFragment)
generate_cacheable_wrapper_node!(DocumentType<ScriptView>, DocumentTypeBinding::Wrap) generate_cacheable_wrapper_node!(DocumentType<ScriptView>, DocumentTypeBinding::Wrap)
generate_binding_object_node!(DocumentType<ScriptView>) generate_binding_object_node!(DocumentType<ScriptView>)
generate_traceable_node!(DocumentType<ScriptView>) generate_traceable_node!(DocumentType<ScriptView>)

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

@ -91,7 +91,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement), ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement),
CommentNodeTypeId => generate_element!(Comment), CommentNodeTypeId => generate_element!(Comment),
DoctypeNodeTypeId => generate_element!(DocumentType<ScriptView>), DoctypeNodeTypeId => generate_element!(DocumentType<ScriptView>),
DocumentFragmentNodeTypeId => generate_element!(DocumentFragment<ScriptView>), DocumentFragmentNodeTypeId => generate_element!(DocumentFragment),
TextNodeTypeId => generate_element!(Text), TextNodeTypeId => generate_element!(Text),
} }
} }

10
src/components/script/dom/documentfragment.rs
View file

@ -8,20 +8,20 @@ use dom::node::{ScriptView, Node, DocumentFragmentNodeTypeId};
use dom::node::{AbstractNode}; use dom::node::{AbstractNode};
use dom::window::Window; use dom::window::Window;
pub struct DocumentFragment<View> { pub struct DocumentFragment {
node: Node<View>, node: Node<ScriptView>,
} }
impl DocumentFragment<ScriptView> { impl DocumentFragment {
/// Creates a new DocumentFragment. /// Creates a new DocumentFragment.
pub fn new(document: AbstractDocument) -> DocumentFragment<ScriptView> { pub fn new(document: AbstractDocument) -> DocumentFragment {
DocumentFragment { DocumentFragment {
node: Node::new(DocumentFragmentNodeTypeId, document), node: Node::new(DocumentFragmentNodeTypeId, document),
} }
} }
pub fn Constructor(owner: @mut Window) -> Fallible<AbstractNode<ScriptView>> { pub fn Constructor(owner: @mut Window) -> Fallible<AbstractNode<ScriptView>> {
let cx = (*owner.page).js_info.get_ref().js_compartment.cx.ptr; let cx = owner.page.js_info.get_ref().js_compartment.cx.ptr;
let fragment = @DocumentFragment::new(owner.Document()); let fragment = @DocumentFragment::new(owner.Document());
Ok(unsafe { Node::as_abstract_node(cx, fragment) }) Ok(unsafe { Node::as_abstract_node(cx, fragment) })
} }