diff options
Diffstat (limited to 'components/script/dom/htmlelement.rs')
-rw-r--r-- | components/script/dom/htmlelement.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index c9c5b5d4ba8..42744ba32a0 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -38,14 +38,14 @@ impl HTMLElementDerived for EventTarget { } impl HTMLElement { - pub fn new_inherited(type_id: ElementTypeId, tag_name: DOMString, document: &JSRef<Document>) -> HTMLElement { + pub fn new_inherited(type_id: ElementTypeId, tag_name: DOMString, document: JSRef<Document>) -> HTMLElement { HTMLElement { element: Element::new_inherited(type_id, tag_name, namespace::HTML, None, document) } } #[allow(unrooted_must_root)] - pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLElement> { + pub fn new(localName: DOMString, document: JSRef<Document>) -> Temporary<HTMLElement> { let element = HTMLElement::new_inherited(HTMLElementTypeId, localName, document); Node::reflect_node(box element, document, HTMLElementBinding::Wrap) } @@ -57,25 +57,25 @@ trait PrivateHTMLElementHelpers { impl<'a> PrivateHTMLElementHelpers for JSRef<'a, HTMLElement> { fn is_body_or_frameset(&self) -> bool { - let eventtarget: &JSRef<EventTarget> = EventTargetCast::from_ref(self); + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); eventtarget.is_htmlbodyelement() || eventtarget.is_htmlframesetelement() } } impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { fn GetOnclick(&self) -> Option<EventHandlerNonNull> { - let eventtarget: &JSRef<EventTarget> = EventTargetCast::from_ref(self); + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); eventtarget.get_event_handler_common("click") } fn SetOnclick(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: &JSRef<EventTarget> = EventTargetCast::from_ref(self); + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); eventtarget.set_event_handler_common("click", listener) } fn GetOnload(&self) -> Option<EventHandlerNonNull> { if self.is_body_or_frameset() { - let win = window_from_node(self).root(); + let win = window_from_node(*self).root(); win.deref().GetOnload() } else { None @@ -84,7 +84,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { fn SetOnload(&self, listener: Option<EventHandlerNonNull>) { if self.is_body_or_frameset() { - let win = window_from_node(self).root(); + let win = window_from_node(*self).root(); win.deref().SetOnload(listener) } } @@ -92,7 +92,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { impl<'a> VirtualMethods for JSRef<'a, HTMLElement> { fn super_type<'a>(&'a self) -> Option<&'a VirtualMethods> { - let element: &JSRef<Element> = ElementCast::from_ref(self); + let element: &JSRef<Element> = ElementCast::from_borrowed_ref(self); Some(element as &VirtualMethods) } @@ -103,11 +103,11 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLElement> { } if name.as_slice().starts_with("on") { - let window = window_from_node(self).root(); + let window = window_from_node(*self).root(); let (cx, url, reflector) = (window.get_cx(), window.get_url(), window.reflector().get_jsobject()); - let evtarget: &JSRef<EventTarget> = EventTargetCast::from_ref(self); + let evtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); evtarget.set_event_handler_uncompiled(cx, url, reflector, name.as_slice().slice_from(2), value); |