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

Remove some redundant code around XMLHttpRequest::document_response().

Browse source
This commit is contained in:
Ms2ger 2016-12-08 20:25:17 -10:00
parent 21ad1c2109
commit b8aab5d115
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,8 +14,7 @@ use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestRespo
use dom::bindings::conversions::ToJSValConvertible; use dom::bindings::conversions::ToJSValConvertible;
use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutHeapJSVal, MutNullableHeap}; use dom::bindings::js::{JS, MutHeapJSVal, MutNullableHeap, Root};
use dom::bindings::js::{Root, RootedReference};
use dom::bindings::refcounted::Trusted; use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::{DomObject, reflect_dom_object}; use dom::bindings::reflector::{DomObject, reflect_dom_object};
use dom::bindings::str::{ByteString, DOMString, USVString, is_token}; use dom::bindings::str::{ByteString, DOMString, USVString, is_token};
@ -758,13 +757,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
}, },
// Step 2 // Step 2
XMLHttpRequestResponseType::Document => { XMLHttpRequestResponseType::Document => {
let op_doc = self.document_response(); self.document_response().to_jsval(cx, rval.handle_mut());
if let Some(doc) = op_doc {
doc.to_jsval(cx, rval.handle_mut());
} else {
// Substep 1
return NullValue();
}
}, },
XMLHttpRequestResponseType::Json => { XMLHttpRequestResponseType::Json => {
self.json_response(cx).to_jsval(cx, rval.handle_mut()); self.json_response(cx).to_jsval(cx, rval.handle_mut());
@ -808,11 +801,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Document => { XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Document => {
// Step 3 // Step 3
if let XMLHttpRequestState::Done = self.ready_state.get() { if let XMLHttpRequestState::Done = self.ready_state.get() {
Ok(self.response_xml.get().or_else(|| { Ok(self.document_response())
let response = self.document_response();
self.response_xml.set(response.r());
response
}))
} else { } else {
// Step 2 // Step 2
Ok(None) Ok(None)