aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/domimplementation.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/script/dom/domimplementation.rs')
-rw-r--r--src/components/script/dom/domimplementation.rs110
1 files changed, 66 insertions, 44 deletions
diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs
index 28d226ba406..53cb09fba16 100644
--- a/src/components/script/dom/domimplementation.rs
+++ b/src/components/script/dom/domimplementation.rs
@@ -4,19 +4,19 @@
use dom::bindings::codegen::BindingDeclarations::DOMImplementationBinding;
use dom::bindings::codegen::InheritTypes::NodeCast;
-use dom::bindings::js::JS;
+use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable};
use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object};
use dom::bindings::error::{Fallible, InvalidCharacter, NamespaceError};
use dom::bindings::utils::{QName, Name, InvalidXMLName, xml_name_type};
-use dom::document::{Document, HTMLDocument, NonHTMLDocument};
+use dom::document::{Document, HTMLDocument, NonHTMLDocument, DocumentMethods};
use dom::documenttype::DocumentType;
use dom::htmlbodyelement::HTMLBodyElement;
use dom::htmlheadelement::HTMLHeadElement;
use dom::htmlhtmlelement::HTMLHtmlElement;
use dom::htmltitleelement::HTMLTitleElement;
-use dom::node::{Node, INode};
+use dom::node::{Node, NodeMethods};
use dom::text::Text;
-use dom::window::Window;
+use dom::window::{Window, WindowMethods};
use servo_util::str::DOMString;
#[deriving(Encodable)]
@@ -26,15 +26,15 @@ pub struct DOMImplementation {
}
impl DOMImplementation {
- pub fn new_inherited(owner: JS<Window>) -> DOMImplementation {
+ pub fn new_inherited(owner: &JSRef<Window>) -> DOMImplementation {
DOMImplementation {
- owner: owner,
+ owner: owner.unrooted(),
reflector_: Reflector::new(),
}
}
- pub fn new(owner: &JS<Window>) -> JS<DOMImplementation> {
- reflect_dom_object(~DOMImplementation::new_inherited(owner.clone()), owner,
+ pub fn new(owner: &JSRef<Window>) -> Temporary<DOMImplementation> {
+ reflect_dom_object(~DOMImplementation::new_inherited(owner), owner,
DOMImplementationBinding::Wrap)
}
}
@@ -49,102 +49,124 @@ impl Reflectable for DOMImplementation {
}
}
+pub trait DOMImplementationMethods {
+ fn CreateDocumentType(&self, qname: DOMString, pubid: DOMString, sysid: DOMString) -> Fallible<Temporary<DocumentType>>;
+ fn CreateDocument(&self, namespace: Option<DOMString>, qname: DOMString,
+ mut maybe_doctype: Option<JSRef<DocumentType>>) -> Fallible<Temporary<Document>>;
+ fn CreateHTMLDocument(&self, title: Option<DOMString>) -> Temporary<Document>;
+}
+
// http://dom.spec.whatwg.org/#domimplementation
-impl DOMImplementation {
+impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> {
// http://dom.spec.whatwg.org/#dom-domimplementation-createdocumenttype
- pub fn CreateDocumentType(&self, qname: DOMString, pubid: DOMString, sysid: DOMString) -> Fallible<JS<DocumentType>> {
+ fn CreateDocumentType(&self, qname: DOMString, pubid: DOMString, sysid: DOMString) -> Fallible<Temporary<DocumentType>> {
match xml_name_type(qname) {
// Step 1.
InvalidXMLName => Err(InvalidCharacter),
// Step 2.
Name => Err(NamespaceError),
// Step 3.
- QName => Ok(DocumentType::new(qname, Some(pubid), Some(sysid), &self.owner.get().Document()))
+ QName => {
+ let owner = self.owner.root();
+ let document = owner.deref().Document().root();
+ Ok(DocumentType::new(qname, Some(pubid), Some(sysid), &*document))
+ }
}
}
// http://dom.spec.whatwg.org/#dom-domimplementation-createdocument
- pub fn CreateDocument(&self, namespace: Option<DOMString>, qname: DOMString,
- maybe_doctype: Option<JS<DocumentType>>) -> Fallible<JS<Document>> {
- // Step 1.
- let doc = Document::new(&self.owner, None, NonHTMLDocument, None);
- let mut doc_node: JS<Node> = NodeCast::from(&doc);
+ fn CreateDocument(&self, namespace: Option<DOMString>, qname: DOMString,
+ mut maybe_doctype: Option<JSRef<DocumentType>>) -> Fallible<Temporary<Document>> {
+ let win = self.owner.root();
+ // Step 1.
+ let mut doc = Document::new(&win.root_ref(), None, NonHTMLDocument, None).root();
// Step 2-3.
- let maybe_elem = if qname.is_empty() {
+ let mut maybe_elem = if qname.is_empty() {
None
} else {
- match doc.get().CreateElementNS(&doc, namespace, qname) {
+ match doc.CreateElementNS(namespace, qname) {
Err(error) => return Err(error),
Ok(elem) => Some(elem)
}
};
- // Step 4.
- match maybe_doctype {
- None => (),
- Some(ref doctype) => assert!(doc_node.AppendChild(&mut NodeCast::from(doctype)).is_ok())
- }
+ {
+ let doc_node: &mut JSRef<Node> = NodeCast::from_mut_ref(&mut *doc);
- // Step 5.
- match maybe_elem {
- None => (),
- Some(ref elem) => assert!(doc_node.AppendChild(&mut NodeCast::from(elem)).is_ok())
+ // Step 4.
+ match maybe_doctype {
+ None => (),
+ Some(ref mut doctype) => {
+ assert!(doc_node.AppendChild(NodeCast::from_mut_ref(doctype)).is_ok())
+ }
+ }
+
+ // Step 5.
+ match maybe_elem.root() {
+ None => (),
+ Some(mut elem) => {
+ assert!(doc_node.AppendChild(NodeCast::from_mut_ref(&mut *elem)).is_ok())
+ }
+ }
}
// Step 6.
// FIXME: https://github.com/mozilla/servo/issues/1522
// Step 7.
- Ok(doc)
+ Ok(Temporary::from_rooted(&*doc))
}
// http://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument
- pub fn CreateHTMLDocument(&self, title: Option<DOMString>) -> JS<Document> {
+ fn CreateHTMLDocument(&self, title: Option<DOMString>) -> Temporary<Document> {
+ let owner = self.owner.root();
+
// Step 1-2.
- let doc = Document::new(&self.owner, None, HTMLDocument, None);
- let mut doc_node: JS<Node> = NodeCast::from(&doc);
+ let mut doc = Document::new(&owner.root_ref(), None, HTMLDocument, None).root();
+ let mut doc_alias = doc.clone();
+ let doc_node: &mut JSRef<Node> = NodeCast::from_mut_ref(&mut doc_alias);
{
// Step 3.
- let doc_type = DocumentType::new(~"html", None, None, &doc);
- assert!(doc_node.AppendChild(&mut NodeCast::from(&doc_type)).is_ok());
+ let mut doc_type = DocumentType::new(~"html", None, None, &*doc).root();
+ assert!(doc_node.AppendChild(NodeCast::from_mut_ref(&mut *doc_type)).is_ok());
}
{
// Step 4.
- let mut doc_html = NodeCast::from(&HTMLHtmlElement::new(~"html", &doc));
- assert!(doc_node.AppendChild(&mut doc_html).is_ok());
+ let mut doc_html = NodeCast::from_unrooted(HTMLHtmlElement::new(~"html", &*doc)).root();
+ assert!(doc_node.AppendChild(&mut *doc_html).is_ok());
{
// Step 5.
- let mut doc_head = NodeCast::from(&HTMLHeadElement::new(~"head", &doc));
- assert!(doc_html.AppendChild(&mut doc_head).is_ok());
+ let mut doc_head = NodeCast::from_unrooted(HTMLHeadElement::new(~"head", &*doc)).root();
+ assert!(doc_html.AppendChild(&mut *doc_head).is_ok());
// Step 6.
match title {
None => (),
Some(title_str) => {
// Step 6.1.
- let mut doc_title = NodeCast::from(&HTMLTitleElement::new(~"title", &doc));
- assert!(doc_head.AppendChild(&mut doc_title).is_ok());
+ let mut doc_title = NodeCast::from_unrooted(HTMLTitleElement::new(~"title", &*doc)).root();
+ assert!(doc_head.AppendChild(&mut *doc_title).is_ok());
// Step 6.2.
- let title_text = Text::new(title_str, &doc);
- assert!(doc_title.AppendChild(&mut NodeCast::from(&title_text)).is_ok());
+ let mut title_text = Text::new(title_str, &*doc).root();
+ assert!(doc_title.AppendChild(NodeCast::from_mut_ref(&mut *title_text)).is_ok());
}
}
}
// Step 7.
- let doc_body = HTMLBodyElement::new(~"body", &doc);
- assert!(doc_html.AppendChild(&mut NodeCast::from(&doc_body)).is_ok());
+ let mut doc_body = HTMLBodyElement::new(~"body", &*doc).root();
+ assert!(doc_html.AppendChild(NodeCast::from_mut_ref(&mut *doc_body)).is_ok());
}
// Step 8.
// FIXME: https://github.com/mozilla/servo/issues/1522
// Step 9.
- doc
+ Temporary::from_rooted(&*doc)
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 21:32:41 +0000