From 51ef2f06ba75f9565d554a5b5d404c9e591a1240 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Wed, 7 May 2014 09:25:32 +1000 Subject: [PATCH] Rename from_unrooted to from_temporary. Fixes #2332. --- .../script/dom/bindings/codegen/CodegenRust.py | 2 +- src/components/script/dom/document.rs | 4 ++-- src/components/script/dom/domimplementation.rs | 6 +++--- src/components/script/dom/node.rs | 16 ++++++++-------- src/components/script/html/hubbub_html_parser.rs | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 65dbe42b4cc..47642641774 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -5281,7 +5281,7 @@ class GlobalGenRoots(): } #[inline(always)] - fn from_unrooted(derived: Temporary) -> Temporary { + fn from_temporary(derived: Temporary) -> Temporary { unsafe { derived.transmute() } } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 08116918bd6..afbf58cbbdc 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -535,8 +535,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { match interface.to_ascii_lower().as_slice() { // FIXME: Implement CustomEvent (http://dom.spec.whatwg.org/#customevent) - "uievents" | "uievent" => Ok(EventCast::from_unrooted(UIEvent::new(&*window))), - "mouseevents" | "mouseevent" => Ok(EventCast::from_unrooted(MouseEvent::new(&*window))), + "uievents" | "uievent" => Ok(EventCast::from_temporary(UIEvent::new(&*window))), + "mouseevents" | "mouseevent" => Ok(EventCast::from_temporary(MouseEvent::new(&*window))), "htmlevents" | "events" | "event" => Ok(Event::new(&*window)), _ => Err(NotSupported) } diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs index a21a20f5634..691d7ca4a81 100644 --- a/src/components/script/dom/domimplementation.rs +++ b/src/components/script/dom/domimplementation.rs @@ -135,12 +135,12 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { { // Step 4. - let mut doc_html = NodeCast::from_unrooted(HTMLHtmlElement::new("html".to_owned(), &*doc)).root(); + let mut doc_html = NodeCast::from_temporary(HTMLHtmlElement::new("html".to_owned(), &*doc)).root(); assert!(doc_node.AppendChild(&mut *doc_html).is_ok()); { // Step 5. - let mut doc_head = NodeCast::from_unrooted(HTMLHeadElement::new("head".to_owned(), &*doc)).root(); + let mut doc_head = NodeCast::from_temporary(HTMLHeadElement::new("head".to_owned(), &*doc)).root(); assert!(doc_html.AppendChild(&mut *doc_head).is_ok()); // Step 6. @@ -148,7 +148,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { None => (), Some(title_str) => { // Step 6.1. - let mut doc_title = NodeCast::from_unrooted(HTMLTitleElement::new("title".to_owned(), &*doc)).root(); + let mut doc_title = NodeCast::from_temporary(HTMLTitleElement::new("title".to_owned(), &*doc)).root(); assert!(doc_head.AppendChild(&mut *doc_title).is_ok()); // Step 6.2. diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 100cfebfa7b..0f6c3f8a65c 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -1229,17 +1229,17 @@ impl Node { let doctype = DocumentType::new(doctype.name.clone(), Some(doctype.public_id.clone()), Some(doctype.system_id.clone()), &*document); - NodeCast::from_unrooted(doctype) + NodeCast::from_temporary(doctype) }, DocumentFragmentNodeTypeId => { let doc_fragment = DocumentFragment::new(&*document); - NodeCast::from_unrooted(doc_fragment) + NodeCast::from_temporary(doc_fragment) }, CommentNodeTypeId => { let comment: &JSRef = CommentCast::to_ref(node).unwrap(); let comment = comment.deref(); let comment = Comment::new(comment.characterdata.data.clone(), &*document); - NodeCast::from_unrooted(comment) + NodeCast::from_temporary(comment) }, DocumentNodeTypeId => { let document: &JSRef = DocumentCast::to_ref(node).unwrap(); @@ -1250,26 +1250,26 @@ impl Node { let window = document.window.root(); let document = Document::new(&*window, Some(document.url().clone()), is_html_doc, None); - NodeCast::from_unrooted(document) + NodeCast::from_temporary(document) }, ElementNodeTypeId(..) => { let element: &JSRef = ElementCast::to_ref(node).unwrap(); let element = element.deref(); let element = build_element_from_tag(element.local_name.clone(), &*document); - NodeCast::from_unrooted(element) + NodeCast::from_temporary(element) }, TextNodeTypeId => { let text: &JSRef = TextCast::to_ref(node).unwrap(); let text = text.deref(); let text = Text::new(text.characterdata.data.clone(), &*document); - NodeCast::from_unrooted(text) + NodeCast::from_temporary(text) }, ProcessingInstructionNodeTypeId => { let pi: &JSRef = ProcessingInstructionCast::to_ref(node).unwrap(); let pi = pi.deref(); let pi = ProcessingInstruction::new(pi.target.clone(), pi.characterdata.data.clone(), &*document); - NodeCast::from_unrooted(pi) + NodeCast::from_temporary(pi) }, }.root(); @@ -1552,7 +1552,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { None } else { let document = self.owner_doc().root(); - Some(NodeCast::from_unrooted(document.deref().CreateTextNode(value))) + Some(NodeCast::from_temporary(document.deref().CreateTextNode(value))) }.root(); // Step 3. diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index 1254b11538c..b1af9774214 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -40,7 +40,7 @@ macro_rules! handle_element( $ctor: ident $(, $arg:expr )*) => ( if $string == $localName { - return ElementCast::from_unrooted($ctor::new($localName, $document $(, $arg)*)); + return ElementCast::from_temporary($ctor::new($localName, $document $(, $arg)*)); } ) ) @@ -243,7 +243,7 @@ pub fn build_element_from_tag(tag: DOMString, document: &JSRef) -> Tem handle_element!(document, tag, "ul", HTMLUListElement); handle_element!(document, tag, "video", HTMLVideoElement); - return ElementCast::from_unrooted(HTMLUnknownElement::new(tag, document)); + return ElementCast::from_temporary(HTMLUnknownElement::new(tag, document)); } pub fn parse_html(page: &Page,