aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/dom/xmlhttprequest.rs28
-rw-r--r--tests/wpt/metadata/xhr/abort-during-upload.any.js.ini9
-rw-r--r--tests/wpt/metadata/xhr/abort-event-order.htm.ini5
-rw-r--r--tests/wpt/metadata/xhr/event-error-order.sub.html.ini5
-rw-r--r--tests/wpt/metadata/xhr/event-timeout-order.any.js.ini9
-rw-r--r--tests/wpt/metadata/xhr/send-timeout-events.htm.ini5
6 files changed, 18 insertions, 43 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 08b37c946c5..6c531e5b4d6 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -618,7 +618,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
}
// Substep 2
if !self.upload_complete.get() {
- self.dispatch_upload_progress_event(atom!("loadstart"), Some(0));
+ self.dispatch_upload_progress_event(atom!("loadstart"), Ok(Some(0)));
if self.generation_id.get() != gen_id {
return Ok(());
}
@@ -1062,11 +1062,11 @@ impl XMLHttpRequest {
self.upload_complete.set(true);
// Substeps 2-4
if !self.sync.get() {
- self.dispatch_upload_progress_event(atom!("progress"), None);
+ self.dispatch_upload_progress_event(atom!("progress"), Ok(None));
return_if_fetch_was_terminated!();
- self.dispatch_upload_progress_event(atom!("load"), None);
+ self.dispatch_upload_progress_event(atom!("load"), Ok(None));
return_if_fetch_was_terminated!();
- self.dispatch_upload_progress_event(atom!("loadend"), None);
+ self.dispatch_upload_progress_event(atom!("loadend"), Ok(None));
return_if_fetch_was_terminated!();
}
// Part of step 13, send() (processing response)
@@ -1164,9 +1164,9 @@ impl XMLHttpRequest {
let upload_complete = &self.upload_complete;
if !upload_complete.get() {
upload_complete.set(true);
- self.dispatch_upload_progress_event(Atom::from(errormsg), None);
+ self.dispatch_upload_progress_event(Atom::from(errormsg), Err(()));
return_if_fetch_was_terminated!();
- self.dispatch_upload_progress_event(atom!("loadend"), None);
+ self.dispatch_upload_progress_event(atom!("loadend"), Err(()));
return_if_fetch_was_terminated!();
}
self.dispatch_response_progress_event(Atom::from(errormsg));
@@ -1210,11 +1210,19 @@ impl XMLHttpRequest {
progressevent.upcast::<Event>().fire(target);
}
- fn dispatch_upload_progress_event(&self, type_: Atom, partial_load: Option<u64>) {
- // If partial_load is None, loading has completed and we can just use the value from the request body
+ fn dispatch_upload_progress_event(&self, type_: Atom, partial_load: Result<Option<u64>, ()>) {
+ // If partial_load is Ok(None), loading has completed and we can just use the value from the request body
+ // If an error occured, we pass 0 for both loaded and total
- let total = self.request_body_len.get() as u64;
- self.dispatch_progress_event(true, type_, partial_load.unwrap_or(total), Some(total));
+ let request_body_len = self.request_body_len.get() as u64;
+ let (loaded, total) = match partial_load {
+ Ok(l) => match l {
+ Some(loaded) => (loaded, Some(request_body_len)),
+ None => (request_body_len, Some(request_body_len)),
+ },
+ Err(()) => (0, None),
+ };
+ self.dispatch_progress_event(true, type_, loaded, total);
}
fn dispatch_response_progress_event(&self, type_: Atom) {
diff --git a/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini b/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini
deleted file mode 100644
index d51a28579eb..00000000000
--- a/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[abort-during-upload.any.html]
- [XMLHttpRequest: abort() while sending data]
- expected: FAIL
-
-
-[abort-during-upload.any.worker.html]
- [XMLHttpRequest: abort() while sending data]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/xhr/abort-event-order.htm.ini b/tests/wpt/metadata/xhr/abort-event-order.htm.ini
deleted file mode 100644
index c77110633c2..00000000000
--- a/tests/wpt/metadata/xhr/abort-event-order.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[abort-event-order.htm]
- type: testharness
- [XMLHttpRequest: The abort() method: abort and loadend events]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/xhr/event-error-order.sub.html.ini b/tests/wpt/metadata/xhr/event-error-order.sub.html.ini
deleted file mode 100644
index 2cf89c33915..00000000000
--- a/tests/wpt/metadata/xhr/event-error-order.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[event-error-order.sub.html]
- type: testharness
- [XMLHttpRequest: event - error (order of events)]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini b/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini
deleted file mode 100644
index 3dc3d95f74b..00000000000
--- a/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[event-timeout-order.any.html]
- [XMLHttpRequest: event - timeout (order of events)]
- expected: FAIL
-
-
-[event-timeout-order.any.worker.html]
- [XMLHttpRequest: event - timeout (order of events)]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini b/tests/wpt/metadata/xhr/send-timeout-events.htm.ini
deleted file mode 100644
index a3bbcb2e325..00000000000
--- a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[send-timeout-events.htm]
- type: testharness
- [XMLHttpRequest: The send() method: timeout is not 0 ]
- expected: FAIL
-