diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-03 22:22:49 -0500 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-03 22:22:49 -0500 |
commit | 6581e3504a60aa1e7c363cc93b1036b4a174c166 (patch) | |
tree | e2de576b80de9fcc795b12135d9a693c058cf1eb /components/script/script_thread.rs | |
parent | 93fc7c9cc3d581da6efa5d04e889c5003c4e5709 (diff) | |
parent | 2416072dc2b264191ab9a6515a8f9c3415849b71 (diff) | |
download | servo-6581e3504a60aa1e7c363cc93b1036b4a174c166.tar.gz servo-6581e3504a60aa1e7c363cc93b1036b4a174c166.zip |
Auto merge of #11585 - asajeffrey:constellation-avoid-deadlock-during-pipeline-closure, r=larsbergstrom
Avoid deadlock when closing a pipeline.
<!-- Please describe your changes on the following line: -->
At the moment, the constellation blocks on a pipeline during closure. This PR makes pipeline closure asynchronous.
---
<!-- 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 #11546.
- [X] These changes do not require tests because testing for absence of deadlock is difficult.
<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11585)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 35ae783f5ff..ed2b0e03ee8 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -1407,6 +1407,7 @@ impl ScriptThread { if window.pipeline() == id { debug!("shutting down layout for root context {:?}", id); shut_down_layout(&context); + let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id)); return true } @@ -1414,6 +1415,7 @@ impl ScriptThread { if let Some(ref mut child_context) = context.remove(id) { shut_down_layout(&child_context); } + let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id)); false } |