diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/layout_interface.rs | 4 | ||||
| -rw-r--r-- | components/script/script_task.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index afc7adedbd3..7a735d22737 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -14,7 +14,7 @@ use ipc_channel::ipc::{IpcReceiver, IpcSender}; use libc::uintptr_t; use msg::compositor_msg::Epoch; use msg::compositor_msg::LayerId; -use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId}; +use msg::constellation_msg::{ConstellationChan, Failure, PipelineId}; use msg::constellation_msg::{WindowSizeData}; use net_traits::PendingAsyncLoad; use net_traits::image_cache_task::ImageCacheTask; @@ -78,7 +78,7 @@ pub enum Msg { /// Requests that the layout task immediately shut down. There must be no more nodes left after /// this, or layout will crash. - ExitNow(PipelineExitType), + ExitNow, /// Get the last epoch counter for this layout task. GetCurrentEpoch(IpcSender<Epoch>), diff --git a/components/script/script_task.rs b/components/script/script_task.rs index ac67e4a5996..508e5c476b9 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1455,7 +1455,7 @@ impl ScriptTask { if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() { debug!("shutting down layout for page {:?}", id); response_port.recv().unwrap(); - chan.send(layout_interface::Msg::ExitNow(exit_type)).ok(); + chan.send(layout_interface::Msg::ExitNow).ok(); } let has_pending_loads = self.incomplete_loads.borrow().len() > 0; @@ -1970,7 +1970,7 @@ impl Drop for ScriptTask { } /// Shuts down layout for the given page tree. -fn shut_down_layout(page_tree: &Rc<Page>, exit_type: PipelineExitType) { +fn shut_down_layout(page_tree: &Rc<Page>, _: PipelineExitType) { let mut channels = vec!(); for page in page_tree.iter() { @@ -1995,7 +1995,7 @@ fn shut_down_layout(page_tree: &Rc<Page>, exit_type: PipelineExitType) { // Destroy the layout task. If there were node leaks, layout will now crash safely. for chan in channels { - chan.send(layout_interface::Msg::ExitNow(exit_type)).ok(); + chan.send(layout_interface::Msg::ExitNow).ok(); } } |