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

remove unused arg from script_task::handle_navigate_msg

Browse source 
remove unnecessary commented-out code
This commit is contained in:
Tim Kuehn 2013-07-29 15:35:26 -07:00
parent ec30e97ddf
commit 2b94dd6664
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/main/compositing/mod.rs
View file

@ -527,7 +527,7 @@ impl CompositorTask {
windowing::Back => constellation_msg::Back, windowing::Back => constellation_msg::Back,
}; };
match pipeline { match pipeline {
Some(ref pipeline) => pipeline.script_chan.send(NavigateMsg(pipeline.id.clone(), direction)), Some(ref pipeline) => pipeline.script_chan.send(NavigateMsg(direction)),
None => error!("Compositor: Recieved navigation event without initialized layout chan"), None => error!("Compositor: Recieved navigation event without initialized layout chan"),
} }
} }

10
src/components/script/script_task.rs
View file

@ -61,7 +61,7 @@ pub enum ScriptMsg {
/// Executes a standalone script. /// Executes a standalone script.
ExecuteMsg(PipelineId, Url), ExecuteMsg(PipelineId, Url),
/// Instructs the script task to send a navigate message to the constellation. /// Instructs the script task to send a navigate message to the constellation.
NavigateMsg(PipelineId, NavigationDirection), NavigateMsg(NavigationDirection),
/// Sends a DOM event. /// Sends a DOM event.
SendEventMsg(PipelineId, Event), SendEventMsg(PipelineId, Event),
/// Fires a JavaScript timeout. /// Fires a JavaScript timeout.
@ -450,7 +450,7 @@ impl ScriptTask {
ExecuteMsg(id, url) => self.handle_execute_msg(id, url), ExecuteMsg(id, url) => self.handle_execute_msg(id, url),
SendEventMsg(id, event) => self.handle_event(id, event), SendEventMsg(id, event) => self.handle_event(id, event),
FireTimerMsg(id, timer_data) => self.handle_fire_timer_msg(id, timer_data), FireTimerMsg(id, timer_data) => self.handle_fire_timer_msg(id, timer_data),
NavigateMsg(id, direction) => self.handle_navigate_msg(id, direction), NavigateMsg(direction) => self.handle_navigate_msg(direction),
ReflowCompleteMsg(id) => self.handle_reflow_complete_msg(id), ReflowCompleteMsg(id) => self.handle_reflow_complete_msg(id),
ResizeInactiveMsg(new_size) => self.handle_resize_inactive_msg(new_size), ResizeInactiveMsg(new_size) => self.handle_resize_inactive_msg(new_size),
ExitMsg => { ExitMsg => {
@ -535,7 +535,8 @@ impl ScriptTask {
} }
/// Handles a navigate forward or backward message. /// Handles a navigate forward or backward message.
fn handle_navigate_msg(&self, pipeline_id: PipelineId, direction: NavigationDirection) { /// TODO(tkuehn): is it ever possible to navigate only on a subframe?
fn handle_navigate_msg(&self, direction: NavigationDirection) {
self.constellation_chan.send(constellation_msg::NavigateMsg(direction)); self.constellation_chan.send(constellation_msg::NavigateMsg(direction));
} }
@ -582,7 +583,6 @@ impl ScriptTask {
// Define the script DOM bindings. // Define the script DOM bindings.
// //
// FIXME: Can this be done earlier, to save the flag? // FIXME: Can this be done earlier, to save the flag?
//let js_info = page.js_info.get_ref();
if !js_info.bindings_initialized { if !js_info.bindings_initialized {
define_bindings(js_info.js_compartment); define_bindings(js_info.js_compartment);
js_info.bindings_initialized = true; js_info.bindings_initialized = true;
@ -718,7 +718,7 @@ impl ScriptTask {
} }
} }
ClickEvent(page_button, point) => { ClickEvent(_button, point) => {
debug!("ClickEvent: clicked at %?", point); debug!("ClickEvent: clicked at %?", point);
let root = page.frame.expect("root frame is None").document.root; let root = page.frame.expect("root frame is None").document.root;