From cc2d68a15d9512508d5b8dcf3c3e13b9caaf6d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Thu, 30 Jan 2020 17:26:17 +0000 Subject: [PATCH 1/3] Do not include request progress/total values on XHR timeout --- components/script/dom/xmlhttprequest.rs | 28 ++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 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::().fire(target); } - fn dispatch_upload_progress_event(&self, type_: Atom, partial_load: Option) { - // 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, ()>) { + // 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) { From bb6f31a0179ac251c18025ef3b3769544bc616df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Thu, 30 Jan 2020 18:20:51 +0000 Subject: [PATCH 2/3] Update expected test results --- tests/wpt/metadata/xhr/abort-during-upload.any.js.ini | 5 ++--- tests/wpt/metadata/xhr/abort-event-order.htm.ini | 3 +-- tests/wpt/metadata/xhr/event-error-order.sub.html.ini | 3 +-- tests/wpt/metadata/xhr/event-timeout-order.any.js.ini | 5 ++--- tests/wpt/metadata/xhr/send-timeout-events.htm.ini | 3 +-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini b/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini index d51a28579eb..4bc774730d3 100644 --- a/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini +++ b/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini @@ -1,9 +1,8 @@ [abort-during-upload.any.html] [XMLHttpRequest: abort() while sending data] - expected: FAIL + expected: PASS [abort-during-upload.any.worker.html] [XMLHttpRequest: abort() while sending data] - expected: FAIL - + expected: PASS diff --git a/tests/wpt/metadata/xhr/abort-event-order.htm.ini b/tests/wpt/metadata/xhr/abort-event-order.htm.ini index c77110633c2..caf247196c9 100644 --- a/tests/wpt/metadata/xhr/abort-event-order.htm.ini +++ b/tests/wpt/metadata/xhr/abort-event-order.htm.ini @@ -1,5 +1,4 @@ [abort-event-order.htm] type: testharness [XMLHttpRequest: The abort() method: abort and loadend events] - expected: FAIL - + expected: PASS diff --git a/tests/wpt/metadata/xhr/event-error-order.sub.html.ini b/tests/wpt/metadata/xhr/event-error-order.sub.html.ini index 2cf89c33915..f167540d41c 100644 --- a/tests/wpt/metadata/xhr/event-error-order.sub.html.ini +++ b/tests/wpt/metadata/xhr/event-error-order.sub.html.ini @@ -1,5 +1,4 @@ [event-error-order.sub.html] type: testharness [XMLHttpRequest: event - error (order of events)] - expected: FAIL - + expected: PASS diff --git a/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini b/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini index 3dc3d95f74b..e4e8db2fe16 100644 --- a/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini +++ b/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini @@ -1,9 +1,8 @@ [event-timeout-order.any.html] [XMLHttpRequest: event - timeout (order of events)] - expected: FAIL + expected: PASS [event-timeout-order.any.worker.html] [XMLHttpRequest: event - timeout (order of events)] - expected: FAIL - + expected: PASS diff --git a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini b/tests/wpt/metadata/xhr/send-timeout-events.htm.ini index a3bbcb2e325..1c055d69340 100644 --- a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini +++ b/tests/wpt/metadata/xhr/send-timeout-events.htm.ini @@ -1,5 +1,4 @@ [send-timeout-events.htm] type: testharness [XMLHttpRequest: The send() method: timeout is not 0 ] - expected: FAIL - + expected: PASS From b3ca098f6427aba5cc454d6d1e46b41f194a9e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Fri, 31 Jan 2020 17:17:12 +0000 Subject: [PATCH 3/3] Remove ini files for passing tests --- tests/wpt/metadata/xhr/abort-during-upload.any.js.ini | 8 -------- tests/wpt/metadata/xhr/abort-event-order.htm.ini | 4 ---- tests/wpt/metadata/xhr/event-error-order.sub.html.ini | 4 ---- tests/wpt/metadata/xhr/event-timeout-order.any.js.ini | 8 -------- tests/wpt/metadata/xhr/send-timeout-events.htm.ini | 4 ---- 5 files changed, 28 deletions(-) delete mode 100644 tests/wpt/metadata/xhr/abort-during-upload.any.js.ini delete mode 100644 tests/wpt/metadata/xhr/abort-event-order.htm.ini delete mode 100644 tests/wpt/metadata/xhr/event-error-order.sub.html.ini delete mode 100644 tests/wpt/metadata/xhr/event-timeout-order.any.js.ini delete mode 100644 tests/wpt/metadata/xhr/send-timeout-events.htm.ini 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 4bc774730d3..00000000000 --- a/tests/wpt/metadata/xhr/abort-during-upload.any.js.ini +++ /dev/null @@ -1,8 +0,0 @@ -[abort-during-upload.any.html] - [XMLHttpRequest: abort() while sending data] - expected: PASS - - -[abort-during-upload.any.worker.html] - [XMLHttpRequest: abort() while sending data] - expected: PASS 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 caf247196c9..00000000000 --- a/tests/wpt/metadata/xhr/abort-event-order.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[abort-event-order.htm] - type: testharness - [XMLHttpRequest: The abort() method: abort and loadend events] - expected: PASS 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 f167540d41c..00000000000 --- a/tests/wpt/metadata/xhr/event-error-order.sub.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[event-error-order.sub.html] - type: testharness - [XMLHttpRequest: event - error (order of events)] - expected: PASS 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 e4e8db2fe16..00000000000 --- a/tests/wpt/metadata/xhr/event-timeout-order.any.js.ini +++ /dev/null @@ -1,8 +0,0 @@ -[event-timeout-order.any.html] - [XMLHttpRequest: event - timeout (order of events)] - expected: PASS - - -[event-timeout-order.any.worker.html] - [XMLHttpRequest: event - timeout (order of events)] - expected: PASS 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 1c055d69340..00000000000 --- a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini +++ /dev/null @@ -1,4 +0,0 @@ -[send-timeout-events.htm] - type: testharness - [XMLHttpRequest: The send() method: timeout is not 0 ] - expected: PASS