aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.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/script/dom/window.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/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs11
1 files changed, 1 insertions, 10 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 07509a92e4a..b4984bb2a4a 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -45,7 +45,7 @@ use js::jsapi::{JS_GetRuntime, JS_GC, MutableHandleValue, SetWindowProxy};
use js::rust::CompileOptionsWrapper;
use js::rust::Runtime;
use libc;
-use msg::constellation_msg::{FrameType, LoadData, PanicMsg, PipelineId, SubpageId, WindowSizeType};
+use msg::constellation_msg::{FrameType, LoadData, PipelineId, SubpageId, WindowSizeType};
use net_traits::ResourceThreads;
use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread};
@@ -266,9 +266,6 @@ pub struct Window {
/// A list of scroll offsets for each scrollable element.
scroll_offsets: DOMRefCell<HashMap<UntrustedNodeAddress, Point2D<f32>>>,
-
- #[ignore_heap_size_of = "Defined in ipc-channel"]
- panic_chan: IpcSender<PanicMsg>,
}
impl Window {
@@ -1424,10 +1421,6 @@ impl Window {
&self.scheduler_chan
}
- pub fn panic_chan(&self) -> &IpcSender<PanicMsg> {
- &self.panic_chan
- }
-
pub fn schedule_callback(&self, callback: OneshotTimerCallback, duration: MsDuration) -> OneshotTimerHandle {
self.timers.schedule_callback(callback,
duration,
@@ -1623,7 +1616,6 @@ impl Window {
constellation_chan: IpcSender<ConstellationMsg>,
control_chan: IpcSender<ConstellationControlMsg>,
scheduler_chan: IpcSender<TimerEventRequest>,
- panic_chan: IpcSender<PanicMsg>,
timer_event_chan: IpcSender<TimerEvent>,
layout_chan: Sender<Msg>,
id: PipelineId,
@@ -1693,7 +1685,6 @@ impl Window {
ignore_further_async_events: Arc::new(AtomicBool::new(false)),
error_reporter: error_reporter,
scroll_offsets: DOMRefCell::new(HashMap::new()),
- panic_chan: panic_chan,
};
WindowBinding::Wrap(runtime.cx(), win)