aboutsummaryrefslogtreecommitdiffstats
path: root/components/constellation/pipeline.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-21 11:20:37 -0500
committerGitHub <noreply@github.com>2016-07-21 11:20:37 -0500
commitdf1b00d43db615244e8e4bcf8296ed51b64249ea (patch)
tree41ef9ab638ea67979e19ee6914f4f3f206b3f184 /components/constellation/pipeline.rs
parent07a0c2f1dc87fc21a4ed96d251390a4bff165bda (diff)
parentc889900cff2cde40d21fa27810b9c4b0b57c390a (diff)
downloadservo-df1b00d43db615244e8e4bcf8296ed51b64249ea.tar.gz
servo-df1b00d43db615244e8e4bcf8296ed51b64249ea.zip
Auto merge of #12468 - asajeffrey:constellation-remove-panic-channel, r=emilio
Removed panic channel, replaced by integrated logging and issue reporting <!-- Please describe your changes on the following line: --> Remove the previous ad hoc panic channel, replace it by an integrated logging and panicking mechanism, including crash reporting. All thread panics are now reported, not just content threads. --- <!-- 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 #11838 - [X] These changes do not require tests because we don't test error reporting <!-- 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="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12468) <!-- Reviewable:end -->
Diffstat (limited to 'components/constellation/pipeline.rs')
-rw-r--r--components/constellation/pipeline.rs10
1 files changed, 1 insertions, 9 deletions
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs
index 45edc40ae2a..dd2a665f6ac 100644
--- a/components/constellation/pipeline.rs
+++ b/components/constellation/pipeline.rs
@@ -17,7 +17,7 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
use layers::geometry::DevicePixel;
use layout_traits::LayoutThreadFactory;
-use msg::constellation_msg::{FrameId, FrameType, LoadData, PanicMsg, PipelineId};
+use msg::constellation_msg::{FrameId, FrameType, LoadData, PipelineId};
use msg::constellation_msg::{PipelineNamespaceId, SubpageId};
use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::image_cache_thread::ImageCacheThread;
@@ -89,8 +89,6 @@ pub struct InitialPipelineState {
pub constellation_chan: IpcSender<ScriptMsg>,
/// A channel for the layout thread to send messages to the constellation.
pub layout_to_constellation_chan: IpcSender<LayoutMsg>,
- /// A channel to report panics
- pub panic_chan: IpcSender<PanicMsg>,
/// A channel to schedule timer events.
pub scheduler_chan: IpcSender<TimerEventRequest>,
/// A channel to the compositor.
@@ -159,7 +157,6 @@ impl Pipeline {
frame_type: frame_type,
load_data: state.load_data.clone(),
paint_chan: layout_to_paint_chan.clone().to_opaque(),
- panic_chan: state.panic_chan.clone(),
pipeline_port: pipeline_port,
layout_to_constellation_chan: state.layout_to_constellation_chan.clone(),
content_process_shutdown_chan: layout_content_process_shutdown_chan.clone(),
@@ -182,7 +179,6 @@ impl Pipeline {
layout_to_paint_port,
chrome_to_paint_port,
state.compositor_proxy.clone_compositor_proxy(),
- state.panic_chan.clone(),
state.font_cache_thread.clone(),
state.time_profiler_chan.clone(),
state.mem_profiler_chan.clone());
@@ -234,7 +230,6 @@ impl Pipeline {
layout_to_constellation_chan: state.layout_to_constellation_chan,
script_chan: script_chan.clone(),
load_data: state.load_data.clone(),
- panic_chan: state.panic_chan,
script_port: script_port,
opts: (*opts::get()).clone(),
prefs: PREFS.cloned(),
@@ -426,7 +421,6 @@ pub struct UnprivilegedPipelineContent {
window_size: Option<WindowSizeData>,
script_chan: IpcSender<ConstellationControlMsg>,
load_data: LoadData,
- panic_chan: IpcSender<PanicMsg>,
script_port: IpcReceiver<ConstellationControlMsg>,
layout_to_paint_chan: OptionalIpcSender<LayoutToPaintMsg>,
opts: Opts,
@@ -452,7 +446,6 @@ impl UnprivilegedPipelineContent {
control_port: self.script_port,
constellation_chan: self.constellation_chan,
scheduler_chan: self.scheduler_chan,
- panic_chan: self.panic_chan.clone(),
bluetooth_thread: self.bluetooth_thread,
resource_threads: self.resource_threads,
image_cache_thread: self.image_cache_thread.clone(),
@@ -470,7 +463,6 @@ impl UnprivilegedPipelineContent {
layout_pair,
self.pipeline_port,
self.layout_to_constellation_chan,
- self.panic_chan,
self.script_chan,
self.layout_to_paint_chan,
self.image_cache_thread,