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

Auto merge of #14527 - servo:xhr-doc, r=Manishearth

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

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14527)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-09 01:02:27 -08:00 • committed by GitHub
commit c3c086e521
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::error::{Error, ErrorResult, Fallible};
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutHeapJSVal, MutNullableHeap};
use dom::bindings::js::{Root, RootedReference};
use dom::bindings::js::{JS, MutHeapJSVal, MutNullableHeap, Root};
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::{DomObject, reflect_dom_object};
use dom::bindings::str::{ByteString, DOMString, USVString, is_token};
@ -758,13 +757,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
},
// Step 2
XMLHttpRequestResponseType::Document => {
let op_doc = self.document_response();
if let Some(doc) = op_doc {
doc.to_jsval(cx, rval.handle_mut());
} else {
// Substep 1
return NullValue();
}
self.document_response().to_jsval(cx, rval.handle_mut());
},
XMLHttpRequestResponseType::Json => {
self.json_response(cx).to_jsval(cx, rval.handle_mut());
@ -808,11 +801,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Document => {
// Step 3
if let XMLHttpRequestState::Done = self.ready_state.get() {
Ok(self.response_xml.get().or_else(|| {
let response = self.document_response();
self.response_xml.set(response.r());
response
}))
Ok(self.document_response())
} else {
// Step 2
Ok(None)