aboutsummaryrefslogtreecommitdiffstats
path: root/components/gfx/paint_thread.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-06-03 22:22:49 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2016-06-03 22:22:49 -0500
commit6581e3504a60aa1e7c363cc93b1036b4a174c166 (patch)
treee2de576b80de9fcc795b12135d9a693c058cf1eb /components/gfx/paint_thread.rs
parent93fc7c9cc3d581da6efa5d04e889c5003c4e5709 (diff)
parent2416072dc2b264191ab9a6515a8f9c3415849b71 (diff)
downloadservo-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/gfx/paint_thread.rs')
-rw-r--r--components/gfx/paint_thread.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/gfx/paint_thread.rs b/components/gfx/paint_thread.rs
index 648912b0351..9a7b6e3c49c 100644
--- a/components/gfx/paint_thread.rs
+++ b/components/gfx/paint_thread.rs
@@ -435,7 +435,7 @@ impl<C> PaintThread<C> where C: PaintListener + Send + 'static {
}
debug!("paint_thread: shutdown_chan send");
- shutdown_chan.send(()).unwrap();
+ let _ = shutdown_chan.send(());
}, Some(id), panic_chan);
}