aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xmlhttprequest.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-05-13 14:20:00 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-11 19:44:32 +0200
commit0b3ab875f4c99f63d6caa9be528890ad98b1b2b7 (patch)
tree4139e748dd73a729f5a84c277e90f3f15e0df85a /components/script/dom/xmlhttprequest.rs
parent51bcf516c831f60a6fc05d970df5fad99730558e (diff)
downloadservo-0b3ab875f4c99f63d6caa9be528890ad98b1b2b7.tar.gz
servo-0b3ab875f4c99f63d6caa9be528890ad98b1b2b7.zip
Remove intrinsic Root::r()
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
-rw-r--r--components/script/dom/xmlhttprequest.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 7d4ce833f87..39cb2f3a956 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -306,7 +306,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
username: Option<USVString>, password: Option<USVString>) -> ErrorResult {
// Step 1
if let Some(window) = Root::downcast::<Window>(self.global()) {
- if !window.Document().r().is_fully_active() {
+ if !window.Document().is_fully_active() {
return Err(Error::InvalidState);
}
}
@@ -1111,7 +1111,7 @@ impl XMLHttpRequest {
// Step 3, 4
let bytes = self.response.borrow().to_vec();
let blob = Blob::new(&self.global(), BlobImpl::new_from_bytes(bytes), mime);
- self.response_blob.set(Some(blob.r()));
+ self.response_blob.set(Some(&blob));
blob
}
@@ -1156,7 +1156,7 @@ impl XMLHttpRequest {
// Step 9
temp_doc.set_encoding(charset);
// Step 13
- self.response_xml.set(Some(temp_doc.r()));
+ self.response_xml.set(Some(&temp_doc));
return self.response_xml.get();
}
@@ -1199,7 +1199,7 @@ impl XMLHttpRequest {
let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap();
let document = self.new_doc(IsHTMLDocument::HTMLDocument);
// TODO: Disable scripting while parsing
- parse_html(document.r(),
+ parse_html(&document,
DOMString::from(decoded),
wr.get_url(),
ParseContext::Owner(Some(wr.pipeline_id())));
@@ -1212,7 +1212,7 @@ impl XMLHttpRequest {
let decoded = charset.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap();
let document = self.new_doc(IsHTMLDocument::NonHTMLDocument);
// TODO: Disable scripting while parsing
- parse_xml(document.r(),
+ parse_xml(&document,
DOMString::from(decoded),
wr.get_url(),
xml::ParseContext::Owner(Some(wr.pipeline_id())));
@@ -1223,7 +1223,6 @@ impl XMLHttpRequest {
let wr = self.global();
let win = wr.as_window();
let doc = win.Document();
- let doc = doc.r();
let docloader = DocumentLoader::new(&*doc.loader());
let base = wr.get_url();
let parsed_url = match base.join(&self.ResponseURL().0) {