aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorNicholas Nethercote <nnethercote@mozilla.com>2015-06-10 21:18:39 -0700
committerNicholas Nethercote <nnethercote@mozilla.com>2015-06-10 21:18:39 -0700
commit67e7436cb81cbea41b51bb9e8d581e647cf5bcc4 (patch)
tree2f2152d1745d123b1d269a1cd8e03ec341229388 /components
parentfdeebf86a1424e9fffa122efa08fe397f6e7cd7d (diff)
downloadservo-67e7436cb81cbea41b51bb9e8d581e647cf5bcc4.tar.gz
servo-67e7436cb81cbea41b51bb9e8d581e647cf5bcc4.zip
Ignore CollectReport messages when shutting down the LayoutTask.
Prior to this change, a panic would occur if a CollectReport message was received while the LayoutTask was shutting down. Now it just gets ignored.
Diffstat (limited to 'components')
-rw-r--r--components/layout/layout_task.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 4fd06ecbe02..2756780dfb2 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -601,9 +601,11 @@ impl LayoutTask {
self.exit_now(possibly_locked_rw_data, exit_type);
break
}
+ Msg::CollectReports(_) => {
+ // Just ignore these messages at this point.
+ }
_ => {
- panic!("layout: message that wasn't `ExitNow` received after \
- `PrepareToExitMsg`")
+ panic!("layout: unexpected message received after `PrepareToExitMsg`")
}
}
}