diff options
Diffstat (limited to 'components/script_traits/lib.rs')
| -rw-r--r-- | components/script_traits/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 7175536f280..9b3fb014516 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -41,7 +41,7 @@ use gfx_traits::Epoch; use gfx_traits::LayerId; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use libc::c_void; -use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, WindowSizeData}; +use msg::constellation_msg::{ConstellationChan, PanicMsg, PipelineId, WindowSizeData}; use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData}; use msg::constellation_msg::{PipelineNamespaceId, SubpageId}; use msg::webdriver_msg::WebDriverScriptCommand; @@ -93,10 +93,10 @@ pub struct NewLayoutInfo { /// The paint channel, cast to `OptionalOpaqueIpcSender`. This is really an /// `Sender<LayoutToPaintMsg>`. pub paint_chan: OptionalOpaqueIpcSender, - /// Information on what to do on thread failure. - pub failure: Failure, /// A port on which layout can receive messages from the pipeline. pub pipeline_port: IpcReceiver<LayoutControlMsg>, + /// A channel for sending panics on + pub panic_chan: ConstellationChan<PanicMsg>, /// A shutdown channel so that layout can notify others when it's done. pub layout_shutdown_chan: IpcSender<()>, /// A shutdown channel so that layout can tell the content process to shut down when it's done. @@ -315,10 +315,10 @@ pub struct InitialScriptState { pub constellation_chan: ConstellationChan<ScriptMsg>, /// A channel for the layout thread to send messages to the constellation. pub layout_to_constellation_chan: ConstellationChan<LayoutMsg>, + /// A channel for sending panics to the constellation. + pub panic_chan: ConstellationChan<PanicMsg>, /// A channel to schedule timer events. pub scheduler_chan: IpcSender<TimerEventRequest>, - /// Information that script sends out when it panics. - pub failure_info: Failure, /// A channel to the resource manager thread. pub resource_thread: ResourceThread, /// A channel to the storage thread. |