Review fixes

This commit is contained in:
Manish Goregaokar 2016-06-10 15:46:12 +05:30
parent 8b9479f8bf
commit 9deecd793c
No known key found for this signature in database
GPG key ID: 3BBF4D3E2EF79F98
11 changed files with 44 additions and 549 deletions

View file

@ -236,16 +236,15 @@ impl XMLHttpRequest {
self.xhr.root().process_data_available(self.gen_id, self.buf.borrow().clone());
}
fn process_response_eof(&mut self, response: Result<(), NetworkError>) {
match response {
let rv = match response {
Ok(()) => {
let rv = self.xhr.root().process_response_complete(self.gen_id, Ok(()));
*self.sync_status.borrow_mut() = Some(rv);
self.xhr.root().process_response_complete(self.gen_id, Ok(()))
}
Err(e) => {
let rv = self.xhr.root().process_response_complete(self.gen_id, Err(e));
*self.sync_status.borrow_mut() = Some(rv);
self.xhr.root().process_response_complete(self.gen_id, Err(e))
}
}
};
*self.sync_status.borrow_mut() = Some(rv);
}
}
@ -569,7 +568,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
CredentialsMode::CredentialsSameOrigin
};
let use_url_credentials = if let Some(ref url) = *self.request_url.borrow() {
url.username().len() != 0 || url.password().is_some()
!url.username().is_empty() || url.password().is_some()
} else {
unreachable!()
};
@ -888,8 +887,6 @@ impl XMLHttpRequest {
},
};
// todo allow cors in mozbrowser
*self.response_url.borrow_mut() = metadata.final_url[..Position::AfterQuery].to_owned();
// XXXManishearth Clear cache entries in case of a network error