diff options
Diffstat (limited to 'components/script/dom/domimplementation.rs')
| -rw-r--r-- | components/script/dom/domimplementation.rs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 36d74258ca7..1c5c3cd55cf 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -30,14 +30,14 @@ pub struct DOMImplementation { } impl DOMImplementation { - pub fn new_inherited(document: &JSRef<Document>) -> DOMImplementation { + pub fn new_inherited(document: JSRef<Document>) -> DOMImplementation { DOMImplementation { document: JS::from_rooted(document), reflector_: Reflector::new(), } } - pub fn new(document: &JSRef<Document>) -> Temporary<DOMImplementation> { + pub fn new(document: JSRef<Document>) -> Temporary<DOMImplementation> { let window = document.window.root(); reflect_dom_object(box DOMImplementation::new_inherited(document), &Window(*window), @@ -63,7 +63,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { // Step 3. QName => { let document = self.document.root(); - Ok(DocumentType::new(qname, Some(pubid), Some(sysid), &*document)) + Ok(DocumentType::new(qname, Some(pubid), Some(sysid), *document)) } } } @@ -75,7 +75,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { let win = doc.window.root(); // Step 1. - let doc = Document::new(&win.root_ref(), None, NonHTMLDocument, None).root(); + let doc = Document::new(*win, None, NonHTMLDocument, None).root(); // Step 2-3. let maybe_elem = if qname.is_empty() { None @@ -87,13 +87,13 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { }; { - let doc_node: &JSRef<Node> = NodeCast::from_ref(&*doc); + let doc_node: JSRef<Node> = NodeCast::from_ref(*doc); // Step 4. match maybe_doctype { None => (), Some(ref doctype) => { - let doc_type: &JSRef<Node> = NodeCast::from_ref(doctype); + let doc_type: JSRef<Node> = NodeCast::from_ref(*doctype); assert!(doc_node.AppendChild(doc_type).is_ok()) } } @@ -102,7 +102,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { match maybe_elem.root() { None => (), Some(elem) => { - assert!(doc_node.AppendChild(NodeCast::from_ref(&*elem)).is_ok()) + assert!(doc_node.AppendChild(NodeCast::from_ref(*elem)).is_ok()) } } } @@ -111,7 +111,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { // FIXME: https://github.com/mozilla/servo/issues/1522 // Step 7. - Ok(Temporary::from_rooted(&*doc)) + Ok(Temporary::from_rooted(*doc)) } // http://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument @@ -120,54 +120,54 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { let win = document.window.root(); // Step 1-2. - let doc = Document::new(&win.root_ref(), None, HTMLDocument, None).root(); - let doc_node: &JSRef<Node> = NodeCast::from_ref(&*doc); + let doc = Document::new(*win, None, HTMLDocument, None).root(); + let doc_node: JSRef<Node> = NodeCast::from_ref(*doc); { // Step 3. - let doc_type = DocumentType::new("html".to_string(), None, None, &*doc).root(); - assert!(doc_node.AppendChild(NodeCast::from_ref(&*doc_type)).is_ok()); + let doc_type = DocumentType::new("html".to_string(), None, None, *doc).root(); + assert!(doc_node.AppendChild(NodeCast::from_ref(*doc_type)).is_ok()); } { // Step 4. - let doc_html: Root<Node> = NodeCast::from_temporary(HTMLHtmlElement::new("html".to_string(), &*doc)).root(); + let doc_html: Root<Node> = NodeCast::from_temporary(HTMLHtmlElement::new("html".to_string(), *doc)).root(); let doc_html = doc_html.deref(); - assert!(doc_node.AppendChild(doc_html).is_ok()); + assert!(doc_node.AppendChild(*doc_html).is_ok()); { // Step 5. - let doc_head: Root<Node> = NodeCast::from_temporary(HTMLHeadElement::new("head".to_string(), &*doc)).root(); + let doc_head: Root<Node> = NodeCast::from_temporary(HTMLHeadElement::new("head".to_string(), *doc)).root(); let doc_head = doc_head.deref(); - assert!(doc_html.AppendChild(doc_head).is_ok()); + assert!(doc_html.AppendChild(*doc_head).is_ok()); // Step 6. match title { None => (), Some(title_str) => { // Step 6.1. - let doc_title: Root<Node> = NodeCast::from_temporary(HTMLTitleElement::new("title".to_string(), &*doc)).root(); + let doc_title: Root<Node> = NodeCast::from_temporary(HTMLTitleElement::new("title".to_string(), *doc)).root(); let doc_title = doc_title.deref(); - assert!(doc_head.AppendChild(doc_title).is_ok()); + assert!(doc_head.AppendChild(*doc_title).is_ok()); // Step 6.2. - let title_text: Root<Text> = Text::new(title_str, &*doc).root(); + let title_text: Root<Text> = Text::new(title_str, *doc).root(); let title_text = title_text.deref(); - assert!(doc_title.AppendChild(NodeCast::from_ref(title_text)).is_ok()); + assert!(doc_title.AppendChild(NodeCast::from_ref(*title_text)).is_ok()); } } } // Step 7. - let doc_body: Root<HTMLBodyElement> = HTMLBodyElement::new("body".to_string(), &*doc).root(); + let doc_body: Root<HTMLBodyElement> = HTMLBodyElement::new("body".to_string(), *doc).root(); let doc_body = doc_body.deref(); - assert!(doc_html.AppendChild(NodeCast::from_ref(doc_body)).is_ok()); + assert!(doc_html.AppendChild(NodeCast::from_ref(*doc_body)).is_ok()); } // Step 8. // FIXME: https://github.com/mozilla/servo/issues/1522 // Step 9. - Temporary::from_rooted(&*doc) + Temporary::from_rooted(*doc) } } |