mirror of
https://github.com/servo/servo.git
synced 2025-06-11 01:50:10 +00:00
Remove the unused PipelineExitType arguments from ScriptTask::handle_exit_pipeline_msg and shut_down_layout.
This commit is contained in:
parent
ad33d920e7
commit
ef20972023
1 changed files with 7 additions and 7 deletions
|
@ -64,7 +64,7 @@ use mem::heap_size_of_self_and_children;
|
|||
use msg::compositor_msg::{EventResult, LayerId, ScriptToCompositorMsg};
|
||||
use msg::constellation_msg::Msg as ConstellationMsg;
|
||||
use msg::constellation_msg::{ConstellationChan, FocusType, LoadData};
|
||||
use msg::constellation_msg::{MozBrowserEvent, PipelineExitType, PipelineId};
|
||||
use msg::constellation_msg::{MozBrowserEvent, PipelineId};
|
||||
use msg::constellation_msg::{PipelineNamespace};
|
||||
use msg::constellation_msg::{SubpageId, WindowSizeData, WorkerId};
|
||||
use msg::webdriver_msg::WebDriverScriptCommand;
|
||||
|
@ -839,8 +839,8 @@ impl ScriptTask {
|
|||
|
||||
let result = self.profile_event(category, move || {
|
||||
match msg {
|
||||
MixedMessage::FromConstellation(ConstellationControlMsg::ExitPipeline(id, exit_type)) => {
|
||||
if self.handle_exit_pipeline_msg(id, exit_type) {
|
||||
MixedMessage::FromConstellation(ConstellationControlMsg::ExitPipeline(id, _)) => {
|
||||
if self.handle_exit_pipeline_msg(id) {
|
||||
return Some(false)
|
||||
}
|
||||
},
|
||||
|
@ -1437,7 +1437,7 @@ impl ScriptTask {
|
|||
|
||||
/// Handles a request to exit the script task and shut down layout.
|
||||
/// Returns true if the script task should shut down and false otherwise.
|
||||
fn handle_exit_pipeline_msg(&self, id: PipelineId, exit_type: PipelineExitType) -> bool {
|
||||
fn handle_exit_pipeline_msg(&self, id: PipelineId) -> bool {
|
||||
self.closed_pipelines.borrow_mut().insert(id);
|
||||
|
||||
// Check if the exit message is for an in progress load.
|
||||
|
@ -1470,13 +1470,13 @@ impl ScriptTask {
|
|||
let window = page.window();
|
||||
if window.pipeline() == id {
|
||||
debug!("shutting down layout for root page {:?}", id);
|
||||
shut_down_layout(&page, exit_type);
|
||||
shut_down_layout(&page);
|
||||
return true
|
||||
}
|
||||
|
||||
// otherwise find just the matching page and exit all sub-pages
|
||||
if let Some(ref mut child_page) = page.remove(id) {
|
||||
shut_down_layout(&*child_page, exit_type);
|
||||
shut_down_layout(&*child_page);
|
||||
}
|
||||
false
|
||||
}
|
||||
|
@ -1970,7 +1970,7 @@ impl Drop for ScriptTask {
|
|||
}
|
||||
|
||||
/// Shuts down layout for the given page tree.
|
||||
fn shut_down_layout(page_tree: &Rc<Page>, _: PipelineExitType) {
|
||||
fn shut_down_layout(page_tree: &Rc<Page>) {
|
||||
let mut channels = vec!();
|
||||
|
||||
for page in page_tree.iter() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue