From 4fa872511117eafd934cad70c7d3b8c583fb960e Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Thu, 18 Sep 2014 13:43:15 -0700 Subject: First steps of &JSRef -> JSRef conversion Replace &JSRef with JSRef in the bulk of the generated code. This will remove a level of indirection throughout all DOM code. This patch doesn't change methods implemented on JSRef to take `self` rather than `&self`, and it leaves a few other uses of &JSRef, but those changes can be made incrementally. --- components/script/dom/htmlscriptelement.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'components/script/dom/htmlscriptelement.rs') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 29cb155a984..43ba78176d1 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -32,14 +32,14 @@ impl HTMLScriptElementDerived for EventTarget { } impl HTMLScriptElement { - pub fn new_inherited(localName: DOMString, document: &JSRef) -> HTMLScriptElement { + pub fn new_inherited(localName: DOMString, document: JSRef) -> HTMLScriptElement { HTMLScriptElement { htmlelement: HTMLElement::new_inherited(HTMLScriptElementTypeId, localName, document) } } #[allow(unrooted_must_root)] - pub fn new(localName: DOMString, document: &JSRef) -> Temporary { + pub fn new(localName: DOMString, document: JSRef) -> Temporary { let element = HTMLScriptElement::new_inherited(localName, document); Node::reflect_node(box element, document, HTMLScriptElementBinding::Wrap) } @@ -74,7 +74,7 @@ static SCRIPT_JS_MIMES: StaticStringVec = &[ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { fn is_javascript(&self) -> bool { - let element: &JSRef = ElementCast::from_ref(self); + let element: JSRef = ElementCast::from_ref(*self); match element.get_attribute(Null, "type").root().map(|s| s.Value()) { Some(ref s) if s.is_empty() => { // type attr exists, but empty means js @@ -108,19 +108,19 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { fn Src(&self) -> DOMString { - let element: &JSRef = ElementCast::from_ref(self); + let element: JSRef = ElementCast::from_ref(*self); element.get_url_attribute("src") } // http://www.whatwg.org/html/#dom-script-text fn Text(&self) -> DOMString { - let node: &JSRef = NodeCast::from_ref(self); + let node: JSRef = NodeCast::from_ref(*self); Node::collect_text_contents(node.children()) } // http://www.whatwg.org/html/#dom-script-text fn SetText(&self, value: DOMString) { - let node: &JSRef = NodeCast::from_ref(self); + let node: JSRef = NodeCast::from_ref(*self); node.SetTextContent(Some(value)) } } -- cgit v1.2.3