diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-14 19:55:17 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-14 19:55:17 +0530 |
| commit | 2b910678db8b461dc50919832044bd95cdecb53e (patch) | |
| tree | 54a935ee9f1b6dbdcf3f85904c7b4198a6212335 /components/script/script_thread.rs | |
| parent | 3368565b3c6c76e5ce2d170d5c5cfb2f52a56956 (diff) | |
| parent | 8c0fa01884bfb4dcf7d591aa06f48f78f7970766 (diff) | |
| download | servo-2b910678db8b461dc50919832044bd95cdecb53e.tar.gz servo-2b910678db8b461dc50919832044bd95cdecb53e.zip | |
Auto merge of #10587 - asajeffrey:add-failure-panic-message, r=Manishearth
Added panic message to failures.
Added the panic message to failures. This is a step towards #10334, since it gives us access to the panic error message when we fire a `mozbrowsererror` event. The remaining steps are also to record the backtrace, and to report the failure in the event.
<!-- 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/10587)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 7029f34e753..5f2ecd095ba 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -445,7 +445,7 @@ impl ScriptThreadFactory for ScriptThread { let ConstellationChan(const_chan) = state.constellation_chan.clone(); let (script_chan, script_port) = channel(); let layout_chan = LayoutChan(layout_chan.sender()); - let failure_info = state.failure_info; + let failure_info = state.failure_info.clone(); thread::spawn_named_with_send_on_failure(format!("ScriptThread {:?}", state.id), thread_state::SCRIPT, move || { @@ -481,7 +481,7 @@ impl ScriptThreadFactory for ScriptThread { // This must always be the very last operation performed before the thread completes failsafe.neuter(); - }, ConstellationMsg::Failure(failure_info), const_chan); + }, failure_info, const_chan); } } |