aboutsummaryrefslogtreecommitdiffstats
path: root/components/compositing/pipeline.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-14 19:55:17 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-14 19:55:17 +0530
commit2b910678db8b461dc50919832044bd95cdecb53e (patch)
tree54a935ee9f1b6dbdcf3f85904c7b4198a6212335 /components/compositing/pipeline.rs
parent3368565b3c6c76e5ce2d170d5c5cfb2f52a56956 (diff)
parent8c0fa01884bfb4dcf7d591aa06f48f78f7970766 (diff)
downloadservo-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/compositing/pipeline.rs')
-rw-r--r--components/compositing/pipeline.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs
index 3a45a486b8a..3de923ba858 100644
--- a/components/compositing/pipeline.rs
+++ b/components/compositing/pipeline.rs
@@ -140,10 +140,7 @@ impl Pipeline {
.expect("Pipeline script to compositor chan");
let mut pipeline_port = Some(pipeline_port);
- let failure = Failure {
- pipeline_id: state.id,
- parent_info: state.parent_info,
- };
+ let failure = Failure::new(state.id, state.parent_info);
let window_size = state.window_size.map(|size| {
WindowSizeData {
@@ -182,7 +179,7 @@ impl Pipeline {
subpage_id: subpage_id,
load_data: state.load_data.clone(),
paint_chan: layout_to_paint_chan.clone().to_opaque(),
- failure: failure,
+ failure: failure.clone(),
pipeline_port: mem::replace(&mut pipeline_port, None)
.expect("script_pipeline != None but pipeline_port == None"),
layout_shutdown_chan: layout_shutdown_chan.clone(),
@@ -230,7 +227,7 @@ impl Pipeline {
layout_to_constellation_chan: state.layout_to_constellation_chan,
script_chan: script_chan,
load_data: state.load_data.clone(),
- failure: failure,
+ failure: failure.clone(),
script_port: script_port,
opts: (*opts::get()).clone(),
prefs: prefs::get_cloned(),