Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2526 : Manishearth/servo/event-order, r=Ms2ger

Browse source 
For the wpt test [event_load](https://github.com/w3c/web-platform-tests/blob/master/XMLHttpRequest/event-load.htm)

Blocks #2525
This commit is contained in:
bors-servo 2014-06-03 09:40:14 -04:00
commit a90f1e3773
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/components/script/dom/xmlhttprequest.rs
View file

@ -577,34 +577,56 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
match progress {
HeadersReceivedMsg(headers) => {
// XXXManishearth Find a way to track partial progress of the send (onprogresss for XHRUpload)
// Part of step 13, send() (processing request end of file)
// Substep 1
self.upload_complete = true;
// Substeps 2-4
self.dispatch_upload_progress_event("progress".to_owned(), None);
self.dispatch_upload_progress_event("load".to_owned(), None);
self.dispatch_upload_progress_event("loadend".to_owned(), None);
// Part of step 13, send() (processing response)
// XXXManishearth handle errors, if any (substep 1)
// Substep 2 (only headers)
match headers {
Some(ref h) => *self.response_headers = h.clone(),
None => {}
};
// Substep 3
if self.ready_state == Opened {
self.change_ready_state(HeadersReceived);
}
},
LoadingMsg(partial_response) => {
self.response = partial_response;
self.dispatch_response_progress_event("progress".to_owned());
// Part of step 13, send() (processing response body)
// XXXManishearth handle errors, if any (substep 1)
// Substep 2
if self.ready_state == HeadersReceived {
self.change_ready_state(Loading);
}
// Substep 3
self.response = partial_response;
// Substep 4
self.dispatch_response_progress_event("progress".to_owned());
},
DoneMsg => {
// Part of step 13, send() (processing response end of file)
// XXXManishearth handle errors, if any (substep 1)
// Substep 3
if self.ready_state == Loading {
// Subsubsteps 2-4
self.send_flag = false;
self.change_ready_state(XHRDone);
// Subsubsteps 5-7
let len = self.response.len() as u64;
self.dispatch_response_progress_event("progress".to_owned());
self.dispatch_response_progress_event("load".to_owned());
self.dispatch_response_progress_event("loadend".to_owned());
self.send_flag = false;
self.change_ready_state(XHRDone);
}
},
ErroredMsg => {