diff options
Diffstat (limited to 'components/script_traits/lib.rs')
-rw-r--r-- | components/script_traits/lib.rs | 101 |
1 files changed, 2 insertions, 99 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index ed53c70ae39..b85dffd790c 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -28,7 +28,7 @@ use bluetooth_traits::BluetoothRequest; use canvas_traits::webgl::WebGLPipeline; use crossbeam_channel::{Receiver, RecvTimeoutError, Sender}; use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId}; -use embedder_traits::{Cursor, EventLoopWaker}; +use embedder_traits::EventLoopWaker; use euclid::{default::Point2D, Length, Rect, Scale, Size2D, UnknownUnit, Vector2D}; use gfx_traits::Epoch; use http::HeaderMap; @@ -44,7 +44,7 @@ use msg::constellation_msg::BackgroundHangMonitorRegister; use msg::constellation_msg::{ BlobId, BrowsingContextId, HistoryStateId, MessagePortId, PipelineId, }; -use msg::constellation_msg::{PipelineNamespaceId, TopLevelBrowsingContextId, TraversalDirection}; +use msg::constellation_msg::{PipelineNamespaceId, TopLevelBrowsingContextId}; use net_traits::image::base::Image; use net_traits::image_cache::ImageCache; use net_traits::request::Referrer; @@ -62,7 +62,6 @@ use std::collections::{HashMap, VecDeque}; use std::fmt; use std::sync::atomic::AtomicBool; use std::sync::Arc; -use std::time::Duration; use style_traits::CSSPixel; use style_traits::SpeculativePainter; use webrender_api::units::{ @@ -836,102 +835,6 @@ pub enum WebDriverCommandMsg { ), } -/// Messages to the constellation. -#[derive(Deserialize, Serialize)] -pub enum ConstellationMsg { - /// Exit the constellation. - Exit, - /// Request that the constellation send the BrowsingContextId corresponding to the document - /// with the provided pipeline id - GetBrowsingContext(PipelineId, IpcSender<Option<BrowsingContextId>>), - /// Request that the constellation send the current pipeline id for the provided - /// browsing context id, over a provided channel. - GetPipeline(BrowsingContextId, IpcSender<Option<PipelineId>>), - /// Request that the constellation send the current focused top-level browsing context id, - /// over a provided channel. - GetFocusTopLevelBrowsingContext(IpcSender<Option<TopLevelBrowsingContextId>>), - /// Query the constellation to see if the current compositor output is stable - IsReadyToSaveImage(HashMap<PipelineId, Epoch>), - /// Inform the constellation of a key event. - Keyboard(KeyboardEvent), - /// Whether to allow script to navigate. - AllowNavigationResponse(PipelineId, bool), - /// Request to load a page. - LoadUrl(TopLevelBrowsingContextId, ServoUrl), - /// Request to traverse the joint session history of the provided browsing context. - TraverseHistory(TopLevelBrowsingContextId, TraversalDirection), - /// Inform the constellation of a window being resized. - WindowSize( - Option<TopLevelBrowsingContextId>, - WindowSizeData, - WindowSizeType, - ), - /// Requests that the constellation instruct layout to begin a new tick of the animation. - TickAnimation(PipelineId, AnimationTickType), - /// Dispatch a webdriver command - WebDriverCommand(WebDriverCommandMsg), - /// Reload a top-level browsing context. - Reload(TopLevelBrowsingContextId), - /// A log entry, with the top-level browsing context id and thread name - LogEntry(Option<TopLevelBrowsingContextId>, Option<String>, LogEntry), - /// Dispatch WebVR events to the subscribed script threads. - WebVREvents(Vec<PipelineId>, Vec<WebVREvent>), - /// Create a new top level browsing context. - NewBrowser(ServoUrl, TopLevelBrowsingContextId), - /// Close a top level browsing context. - CloseBrowser(TopLevelBrowsingContextId), - /// Panic a top level browsing context. - SendError(Option<TopLevelBrowsingContextId>, String), - /// Make browser visible. - SelectBrowser(TopLevelBrowsingContextId), - /// Forward an event to the script task of the given pipeline. - ForwardEvent(PipelineId, CompositorEvent), - /// Requesting a change to the onscreen cursor. - SetCursor(Cursor), - /// Enable the sampling profiler, with a given sampling rate and max total sampling duration. - EnableProfiler(Duration, Duration), - /// Disable the sampling profiler. - DisableProfiler, - /// Request to exit from fullscreen mode - ExitFullScreen(TopLevelBrowsingContextId), - /// Media session action. - MediaSessionAction(MediaSessionActionType), -} - -impl fmt::Debug for ConstellationMsg { - fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { - use self::ConstellationMsg::*; - let variant = match *self { - Exit => "Exit", - GetBrowsingContext(..) => "GetBrowsingContext", - GetPipeline(..) => "GetPipeline", - GetFocusTopLevelBrowsingContext(..) => "GetFocusTopLevelBrowsingContext", - IsReadyToSaveImage(..) => "IsReadyToSaveImage", - Keyboard(..) => "Keyboard", - AllowNavigationResponse(..) => "AllowNavigationResponse", - LoadUrl(..) => "LoadUrl", - TraverseHistory(..) => "TraverseHistory", - WindowSize(..) => "WindowSize", - TickAnimation(..) => "TickAnimation", - WebDriverCommand(..) => "WebDriverCommand", - Reload(..) => "Reload", - LogEntry(..) => "LogEntry", - WebVREvents(..) => "WebVREvents", - NewBrowser(..) => "NewBrowser", - CloseBrowser(..) => "CloseBrowser", - SendError(..) => "SendError", - SelectBrowser(..) => "SelectBrowser", - ForwardEvent(..) => "ForwardEvent", - SetCursor(..) => "SetCursor", - EnableProfiler(..) => "EnableProfiler", - DisableProfiler => "DisableProfiler", - ExitFullScreen(..) => "ExitFullScreen", - MediaSessionAction(..) => "MediaSessionAction", - }; - write!(formatter, "ConstellationMsg::{}", variant) - } -} - /// Resources required by workerglobalscopes #[derive(Clone, Debug, Deserialize, Serialize)] pub struct WorkerGlobalScopeInit { |