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

Auto merge of #13485 - mathieuh:xhr-event, r=jdm

Browse source 
Make readystatechange fire more often (fixes #13481)

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #13481 (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/13485)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-04 09:46:11 -05:00 • committed by GitHub
commit d42235ee90
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -973,9 +973,16 @@ impl XMLHttpRequest {
*self.response.borrow_mut() = partial_response; *self.response.borrow_mut() = partial_response;
if !self.sync.get() { if !self.sync.get() {
if self.ready_state.get() == XMLHttpRequestState::HeadersReceived { if self.ready_state.get() == XMLHttpRequestState::HeadersReceived {
self.change_ready_state(XMLHttpRequestState::Loading); self.ready_state.set(XMLHttpRequestState::Loading);
return_if_fetch_was_terminated!();
} }
let global = self.global();
let event = Event::new(
global.r(),
atom!("readystatechange"),
EventBubbles::DoesNotBubble,
EventCancelable::Cancelable);
event.fire(self.upcast());
return_if_fetch_was_terminated!();
self.dispatch_response_progress_event(atom!("progress")); self.dispatch_response_progress_event(atom!("progress"));
} }
}, },

4
tests/wpt/web-platform-tests/XMLHttpRequest/event-readystatechange-loaded.htm
View file

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>XMLHttpRequest: the LOADING state change should only happen once</title> <title>XMLHttpRequest: the LOADING state change may be emitted multiple times</title>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[10]/dt[1]"> <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[10]/dt[1]">
@ -26,7 +26,7 @@ test.step(function() {
} }
if (client.readyState === 4) { if (client.readyState === 4) {
assert_equals(countedLoading, 1, "LOADING state change may only be emitted once"); assert_equals(countedLoading, 10, "LOADING state change may be emitted multiple times");
test.done(); test.done();
} }