diff options
Diffstat (limited to 'src/components/script/dom/xmlhttprequest.rs')
-rw-r--r-- | src/components/script/dom/xmlhttprequest.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/components/script/dom/xmlhttprequest.rs b/src/components/script/dom/xmlhttprequest.rs index cc99bb4ea88..f3d76acca39 100644 --- a/src/components/script/dom/xmlhttprequest.rs +++ b/src/components/script/dom/xmlhttprequest.rs @@ -225,7 +225,7 @@ impl XMLHttpRequest { pub trait XMLHttpRequestMethods<'a> { fn GetOnreadystatechange(&self) -> Option<EventHandlerNonNull>; - fn SetOnreadystatechange(&mut self, listener: Option<EventHandlerNonNull>); + fn SetOnreadystatechange(&self, listener: Option<EventHandlerNonNull>); fn ReadyState(&self) -> u16; fn Open(&mut self, _method: ByteString, _url: DOMString) -> ErrorResult; fn Open_(&mut self, _method: ByteString, _url: DOMString, _async: bool, @@ -257,8 +257,8 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> { eventtarget.get_event_handler_common("readystatechange") } - fn SetOnreadystatechange(&mut self, listener: Option<EventHandlerNonNull>) { - let eventtarget: &mut JSRef<EventTarget> = EventTargetCast::from_mut_ref(self); + fn SetOnreadystatechange(&self, listener: Option<EventHandlerNonNull>) { + let eventtarget: &JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("readystatechange", listener) } @@ -431,7 +431,7 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> { // Step 8 let upload_target = &*self.upload.get().root().unwrap(); let event_target: &JSRef<EventTarget> = EventTargetCast::from_ref(upload_target); - if event_target.handlers.iter().len() > 0 { + if event_target.has_handlers() { self.upload_events = true; } @@ -638,10 +638,10 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> { assert!(self.ready_state != rs) self.ready_state = rs; let win = &*self.global.root(); - let mut event = + let event = Event::new(win, "readystatechange".to_string(), false, true).root(); let target: &JSRef<EventTarget> = EventTargetCast::from_ref(self); - target.dispatch_event_with_target(None, &mut *event).ok(); + target.dispatch_event_with_target(None, &*event).ok(); } fn process_partial_response(&mut self, progress: XHRProgress) { @@ -739,16 +739,16 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> { fn dispatch_progress_event(&self, upload: bool, type_: DOMString, loaded: u64, total: Option<u64>) { let win = &*self.global.root(); let upload_target = &*self.upload.get().root().unwrap(); - let mut progressevent = ProgressEvent::new(win, type_, false, false, - total.is_some(), loaded, - total.unwrap_or(0)).root(); + let progressevent = ProgressEvent::new(win, type_, false, false, + total.is_some(), loaded, + total.unwrap_or(0)).root(); let target: &JSRef<EventTarget> = if upload { EventTargetCast::from_ref(upload_target) } else { EventTargetCast::from_ref(self) }; - let event: &mut JSRef<Event> = EventCast::from_mut_ref(&mut *progressevent); - target.dispatch_event_with_target(None, &mut *event).ok(); + let event: &JSRef<Event> = EventCast::from_ref(&*progressevent); + target.dispatch_event_with_target(None, event).ok(); } fn dispatch_upload_progress_event(&self, type_: DOMString, partial_load: Option<u64>) { |