aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2013-10-12 16:08:45 +0200
committerMs2ger <ms2ger@gmail.com>2013-10-12 16:08:45 +0200
commitf4edbb6b2eeed0555ec6acab6867a5cdf8a1c610 (patch)
treede2fcbeb29c9efe4e47b645016573c23a2c5ff39 /src
parent438d121cd8cb3dbe26c3a2589a5d924d7e3cedff (diff)
downloadservo-f4edbb6b2eeed0555ec6acab6867a5cdf8a1c610.tar.gz
servo-f4edbb6b2eeed0555ec6acab6867a5cdf8a1c610.zip
Remove some type variables and an explicit dereference.
Diffstat (limited to 'src')
-rw-r--r--src/components/script/dom/bindings/codegen/Bindings.conf2
-rw-r--r--src/components/script/dom/bindings/element.rs6
-rw-r--r--src/components/script/dom/bindings/node.rs2
-rw-r--r--src/components/script/dom/documentfragment.rs10
4 files changed, 10 insertions, 10 deletions
diff --git a/src/components/script/dom/bindings/codegen/Bindings.conf b/src/components/script/dom/bindings/codegen/Bindings.conf
index 69ab8b0d50f..6b79b533b66 100644
--- a/src/components/script/dom/bindings/codegen/Bindings.conf
+++ b/src/components/script/dom/bindings/codegen/Bindings.conf
@@ -574,7 +574,7 @@ def addHTMLElement(element, concrete=None, needsAbstract=[]):
}
addHTMLElement('Comment')
-addHTMLElement('DocumentFragment', concrete='DocumentFragment<ScriptView>')
+addHTMLElement('DocumentFragment', concrete='DocumentFragment')
addHTMLElement('DocumentType', concrete='DocumentType<ScriptView>')
addHTMLElement('Text')
diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs
index ff1feb1daa1..4c02afa4900 100644
--- a/src/components/script/dom/bindings/element.rs
+++ b/src/components/script/dom/bindings/element.rs
@@ -129,9 +129,9 @@ macro_rules! generate_traceable_node(
generate_cacheable_wrapper!(Comment, CommentBinding::Wrap)
generate_binding_object!(Comment)
generate_traceable!(Comment)
-generate_cacheable_wrapper_node!(DocumentFragment<ScriptView>, DocumentFragmentBinding::Wrap)
-generate_binding_object_node!(DocumentFragment<ScriptView>)
-generate_traceable_node!(DocumentFragment<ScriptView>)
+generate_cacheable_wrapper_node!(DocumentFragment, DocumentFragmentBinding::Wrap)
+generate_binding_object_node!(DocumentFragment)
+generate_traceable_node!(DocumentFragment)
generate_cacheable_wrapper_node!(DocumentType<ScriptView>, DocumentTypeBinding::Wrap)
generate_binding_object_node!(DocumentType<ScriptView>)
generate_traceable_node!(DocumentType<ScriptView>)
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index fe027ad4d6a..f5fdd19db4c 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -91,7 +91,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
ElementNodeTypeId(HTMLUnknownElementTypeId) => generate_element!(HTMLUnknownElement),
CommentNodeTypeId => generate_element!(Comment),
DoctypeNodeTypeId => generate_element!(DocumentType<ScriptView>),
- DocumentFragmentNodeTypeId => generate_element!(DocumentFragment<ScriptView>),
+ DocumentFragmentNodeTypeId => generate_element!(DocumentFragment),
TextNodeTypeId => generate_element!(Text),
}
}
diff --git a/src/components/script/dom/documentfragment.rs b/src/components/script/dom/documentfragment.rs
index d207c340369..8183f620e66 100644
--- a/src/components/script/dom/documentfragment.rs
+++ b/src/components/script/dom/documentfragment.rs
@@ -8,20 +8,20 @@ use dom::node::{ScriptView, Node, DocumentFragmentNodeTypeId};
use dom::node::{AbstractNode};
use dom::window::Window;
-pub struct DocumentFragment<View> {
- node: Node<View>,
+pub struct DocumentFragment {
+ node: Node<ScriptView>,
}
-impl DocumentFragment<ScriptView> {
+impl DocumentFragment {
/// Creates a new DocumentFragment.
- pub fn new(document: AbstractDocument) -> DocumentFragment<ScriptView> {
+ pub fn new(document: AbstractDocument) -> DocumentFragment {
DocumentFragment {
node: Node::new(DocumentFragmentNodeTypeId, document),
}
}
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());
Ok(unsafe { Node::as_abstract_node(cx, fragment) })
}