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

Remove enum variant prefix in XMLHttpRequestState

Browse source 
It was originally titled XHRDone to prevent conflicts with other
variants called Done. This was done before enum namespacing landed, but
now that it has, the prefixing is not necessary.
This commit is contained in:
Corey Farwell 2015-03-25 20:04:58 -04:00
parent 7f587f6cb5
commit ed64e6a7c6
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/xmlhttprequest.rs
View file

@ -71,7 +71,7 @@ enum XMLHttpRequestState {
Opened = 1, Opened = 1,
HeadersReceived = 2, HeadersReceived = 2,
Loading = 3, Loading = 3,
XHRDone = 4, // So as not to conflict with the ProgressMsg `Done` Done = 4,
} }
struct XHRProgressHandler { struct XHRProgressHandler {
@ -497,7 +497,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
match self.ready_state.get() { match self.ready_state.get() {
XMLHttpRequestState::HeadersReceived | XMLHttpRequestState::HeadersReceived |
XMLHttpRequestState::Loading | XMLHttpRequestState::Loading |
XMLHttpRequestState::XHRDone => Err(InvalidState), XMLHttpRequestState::Done => Err(InvalidState),
_ if self.send_flag.get() => Err(InvalidState), _ if self.send_flag.get() => Err(InvalidState),
_ => match self.global.root() { _ => match self.global.root() {
GlobalRoot::Window(_) if self.sync.get() => Err(InvalidAccess), GlobalRoot::Window(_) if self.sync.get() => Err(InvalidAccess),
@ -703,7 +703,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
_ => {} _ => {}
} }
match self.ready_state.get() { match self.ready_state.get() {
XMLHttpRequestState::Loading | XMLHttpRequestState::XHRDone => Err(InvalidState), XMLHttpRequestState::Loading | XMLHttpRequestState::Done => Err(InvalidState),
_ if self.sync.get() => Err(InvalidAccess), _ if self.sync.get() => Err(InvalidAccess),
_ => { _ => {
self.response_type.set(response_type); self.response_type.set(response_type);
@ -716,13 +716,13 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
match self.response_type.get() { match self.response_type.get() {
_empty | Text => { _empty | Text => {
let ready_state = self.ready_state.get(); let ready_state = self.ready_state.get();
if ready_state == XMLHttpRequestState::XHRDone || ready_state == XMLHttpRequestState::Loading { if ready_state == XMLHttpRequestState::Done || ready_state == XMLHttpRequestState::Loading {
self.text_response().to_jsval(cx) self.text_response().to_jsval(cx)
} else { } else {
"".to_jsval(cx) "".to_jsval(cx)
} }
}, },
_ if self.ready_state.get() != XMLHttpRequestState::XHRDone => NullValue(), _ if self.ready_state.get() != XMLHttpRequestState::Done => NullValue(),
Json => { Json => {
let decoded = UTF_8.decode(self.response.borrow().as_slice(), DecoderTrap::Replace).unwrap().to_owned(); let decoded = UTF_8.decode(self.response.borrow().as_slice(), DecoderTrap::Replace).unwrap().to_owned();
let decoded: Vec<u16> = decoded.as_slice().utf16_units().collect(); let decoded: Vec<u16> = decoded.as_slice().utf16_units().collect();
@ -745,7 +745,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
match self.response_type.get() { match self.response_type.get() {
_empty | Text => { _empty | Text => {
match self.ready_state.get() { match self.ready_state.get() {
XMLHttpRequestState::Loading | XMLHttpRequestState::XHRDone => Ok(self.text_response()), XMLHttpRequestState::Loading | XMLHttpRequestState::Done => Ok(self.text_response()),
_ => Ok("".to_owned()) _ => Ok("".to_owned())
} }
}, },
@ -868,7 +868,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
// Subsubsteps 5-7 // Subsubsteps 5-7
self.send_flag.set(false); self.send_flag.set(false);
self.change_ready_state(XMLHttpRequestState::XHRDone); self.change_ready_state(XMLHttpRequestState::Done);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
// Subsubsteps 10-12 // Subsubsteps 10-12
self.dispatch_response_progress_event("progress".to_owned()); self.dispatch_response_progress_event("progress".to_owned());
@ -880,7 +880,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
XHRProgress::Errored(_, e) => { XHRProgress::Errored(_, e) => {
self.send_flag.set(false); self.send_flag.set(false);
// XXXManishearth set response to NetworkError // XXXManishearth set response to NetworkError
self.change_ready_state(XMLHttpRequestState::XHRDone); self.change_ready_state(XMLHttpRequestState::Done);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
let errormsg = match e { let errormsg = match e {