aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/script_msg.rs
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2016-04-15 09:49:13 -0500
committerAlan Jeffrey <ajeffrey@mozilla.com>2016-04-19 09:08:44 -0500
commitcfb066ef2024f05a13da842cedf833a8aa2e8cbe (patch)
treeed58db7aaa3c563a07e185ccb8b350598f30cb2a /components/script_traits/script_msg.rs
parenta7c885706ec4bd526b00ecad5d870415ae6cc1e1 (diff)
downloadservo-cfb066ef2024f05a13da842cedf833a8aa2e8cbe.tar.gz
servo-cfb066ef2024f05a13da842cedf833a8aa2e8cbe.zip
Added a dedicated panic channel.
Diffstat (limited to 'components/script_traits/script_msg.rs')
-rw-r--r--components/script_traits/script_msg.rs18
1 files changed, 1 insertions, 17 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index 23920d150d1..14aa50b6a83 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -12,8 +12,8 @@ use canvas_traits::CanvasMsg;
use euclid::point::Point2D;
use euclid::size::Size2D;
use ipc_channel::ipc::IpcSender;
-use msg::constellation_msg::{Failure, NavigationDirection, PipelineId};
use msg::constellation_msg::{LoadData, SubpageId};
+use msg::constellation_msg::{NavigationDirection, PipelineId};
use offscreen_gl_context::{GLContextAttributes, GLLimits};
use style_traits::cursor::Cursor;
use style_traits::viewport::ViewportConstraints;
@@ -24,20 +24,12 @@ use url::Url;
pub enum LayoutMsg {
/// Indicates whether this pipeline is currently running animations.
ChangeRunningAnimationsState(PipelineId, AnimationState),
- /// Layout thread failure.
- Failure(Failure),
/// Requests that the constellation inform the compositor of the a cursor change.
SetCursor(Cursor),
/// Notifies the constellation that the viewport has been constrained in some manner
ViewportConstrained(PipelineId, ViewportConstraints),
}
-impl From<Failure> for LayoutMsg {
- fn from(failure: Failure) -> LayoutMsg {
- LayoutMsg::Failure(failure)
- }
-}
-
/// Messages from the script to the constellation.
#[derive(Deserialize, Serialize)]
pub enum ScriptMsg {
@@ -55,8 +47,6 @@ pub enum ScriptMsg {
/// Causes a `load` event to be dispatched to any enclosing frame context element
/// for the given pipeline.
DOMLoad(PipelineId),
- /// Script thread failure.
- Failure(Failure),
/// Notifies the constellation that this frame has received focus.
Focus(PipelineId),
/// Re-send a mouse button event that was sent to the parent window.
@@ -92,9 +82,3 @@ pub enum ScriptMsg {
/// Update the pipeline Url, which can change after redirections.
SetFinalUrl(PipelineId, Url),
}
-
-impl From<Failure> for ScriptMsg {
- fn from(failure: Failure) -> ScriptMsg {
- ScriptMsg::Failure(failure)
- }
-}