diff options
author | bors-servo <servo-ops@mozilla.com> | 2020-06-03 13:44:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-03 13:44:09 -0400 |
commit | ff3d5c5125d0bcd048d88e761e02e5ff5a4dc23c (patch) | |
tree | 40089a7aeb8558b3fb3a208f0fc80c0f85f48b50 /components/script/dom/window.rs | |
parent | 0bdc44824d100db2e8c4efcf3c12fab01861b5cc (diff) | |
parent | f4d258d6742ad1898aa97f24010d5c14891b9083 (diff) | |
download | servo-ff3d5c5125d0bcd048d88e761e02e5ff5a4dc23c.tar.gz servo-ff3d5c5125d0bcd048d88e761e02e5ff5a4dc23c.zip |
Auto merge of #26628 - gterzian:shutdown_workers, r=asajeffrey
Improve worker shutdown
<!-- Please describe your changes on the following line: -->
FIX #26548
FIX #25212
and also a step towards https://github.com/servo/servo/issues/26502
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r-- | components/script/dom/window.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index d76cd6dc24d..c050579918e 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1443,8 +1443,8 @@ impl Window { } pub fn clear_js_runtime(&self) { - // Remove the infra for managing messageports and broadcast channels. - self.upcast::<GlobalScope>().remove_web_messaging_infra(); + self.upcast::<GlobalScope>() + .remove_web_messaging_and_dedicated_workers_infra(); // Clean up any active promises // https://github.com/servo/servo/issues/15318 |