Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-17 12:54:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the unused PipelineExitType field from layout_interface::Msg::ExitNow.

Browse source
This commit is contained in:
Ms2ger 2015-11-05 16:11:52 +01:00
parent 5cd250602f
commit ad33d920e7
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/layout_task.rs
View file

@ -492,8 +492,8 @@ impl LayoutTask {
self.handle_request_helper(Msg::GetWebFontLoadState(sender), self.handle_request_helper(Msg::GetWebFontLoadState(sender),
possibly_locked_rw_data) possibly_locked_rw_data)
} }
LayoutControlMsg::ExitNow(exit_type) => { LayoutControlMsg::ExitNow(_) => {
self.handle_request_helper(Msg::ExitNow(exit_type), self.handle_request_helper(Msg::ExitNow,
possibly_locked_rw_data) possibly_locked_rw_data)
} }
} }
@ -631,7 +631,7 @@ impl LayoutTask {
self.prepare_to_exit(response_chan, possibly_locked_rw_data); self.prepare_to_exit(response_chan, possibly_locked_rw_data);
return false return false
}, },
Msg::ExitNow(_) => { Msg::ExitNow => {
debug!("layout: ExitNow received"); debug!("layout: ExitNow received");
self.exit_now(possibly_locked_rw_data); self.exit_now(possibly_locked_rw_data);
return false return false
@ -711,7 +711,7 @@ impl LayoutTask {
self.handle_reap_layout_data(dead_layout_data) self.handle_reap_layout_data(dead_layout_data)
} }
} }
Msg::ExitNow(_) => { Msg::ExitNow => {
debug!("layout task is exiting..."); debug!("layout task is exiting...");
self.exit_now(possibly_locked_rw_data); self.exit_now(possibly_locked_rw_data);
break break

4
components/script/layout_interface.rs
View file

@ -14,7 +14,7 @@ use ipc_channel::ipc::{IpcReceiver, IpcSender};
use libc::uintptr_t; use libc::uintptr_t;
use msg::compositor_msg::Epoch; use msg::compositor_msg::Epoch;
use msg::compositor_msg::LayerId; 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 msg::constellation_msg::{WindowSizeData};
use net_traits::PendingAsyncLoad; use net_traits::PendingAsyncLoad;
use net_traits::image_cache_task::ImageCacheTask; 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 /// Requests that the layout task immediately shut down. There must be no more nodes left after
/// this, or layout will crash. /// this, or layout will crash.
ExitNow(PipelineExitType), ExitNow,
/// Get the last epoch counter for this layout task. /// Get the last epoch counter for this layout task.
GetCurrentEpoch(IpcSender<Epoch>), GetCurrentEpoch(IpcSender<Epoch>),

6
components/script/script_task.rs
View file

@ -1455,7 +1455,7 @@ impl ScriptTask {
if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() { if chan.send(layout_interface::Msg::PrepareToExit(response_chan)).is_ok() {
debug!("shutting down layout for page {:?}", id); debug!("shutting down layout for page {:?}", id);
response_port.recv().unwrap(); 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; 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. /// 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!(); let mut channels = vec!();
for page in page_tree.iter() { 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. // Destroy the layout task. If there were node leaks, layout will now crash safely.
for chan in channels { for chan in channels {
chan.send(layout_interface::Msg::ExitNow(exit_type)).ok(); chan.send(layout_interface::Msg::ExitNow).ok();
} }
} }