Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the unused PipelineExitType argument from Pipeline::exit.

Browse source
This commit is contained in:
Ms2ger 2015-11-05 16:30:22 +01:00
parent 85a762a31a
commit ffffc5f065
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/compositing/constellation.rs
View file

@ -25,7 +25,7 @@ use msg::compositor_msg::Epoch;
use msg::constellation_msg::AnimationState; use msg::constellation_msg::AnimationState;
use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::WebDriverCommandMsg; use msg::constellation_msg::WebDriverCommandMsg;
use msg::constellation_msg::{FrameId, PipelineExitType, PipelineId}; use msg::constellation_msg::{FrameId, PipelineId};
use msg::constellation_msg::{IframeLoadInfo, IFrameSandboxState, MozBrowserEvent, NavigationDirection}; use msg::constellation_msg::{IframeLoadInfo, IFrameSandboxState, MozBrowserEvent, NavigationDirection};
use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData}; use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
use msg::constellation_msg::{PipelineNamespace, PipelineNamespaceId}; use msg::constellation_msg::{PipelineNamespace, PipelineNamespaceId};
@ -565,7 +565,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
fn handle_exit(&mut self) { fn handle_exit(&mut self) {
for (_id, ref pipeline) in &self.pipelines { for (_id, ref pipeline) in &self.pipelines {
pipeline.exit(PipelineExitType::Complete); pipeline.exit();
} }
self.image_cache_task.exit(); self.image_cache_task.exit();
self.resource_task.send(net_traits::ControlMsg::Exit).unwrap(); self.resource_task.send(net_traits::ControlMsg::Exit).unwrap();
@ -1356,7 +1356,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
// Inform script, compositor that this pipeline has exited. // Inform script, compositor that this pipeline has exited.
match exit_mode { match exit_mode {
ExitPipelineMode::Normal => pipeline.exit(PipelineExitType::PipelineOnly), ExitPipelineMode::Normal => pipeline.exit(),
ExitPipelineMode::Force => pipeline.force_exit(), ExitPipelineMode::Force => pipeline.force_exit(),
} }
} }

2
components/compositing/pipeline.rs
View file

@ -248,7 +248,7 @@ impl Pipeline {
let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::PaintPermissionRevoked); let _ = self.chrome_to_paint_chan.send(ChromeToPaintMsg::PaintPermissionRevoked);
} }
pub fn exit(&self, _: PipelineExitType) { pub fn exit(&self) {
debug!("pipeline {:?} exiting", self.id); debug!("pipeline {:?} exiting", self.id);
// Script task handles shutting down layout, and layout handles shutting down the painter. // Script task handles shutting down layout, and layout handles shutting down the painter.