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

Fixup rebase issues

Browse source
This commit is contained in:
James Graham 2015-07-19 20:40:12 +01:00
parent 512ba50315
commit 2a701cc339
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/constellation.rs
View file

@ -948,7 +948,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
fn load_url_for_webdriver(&mut self, fn load_url_for_webdriver(&mut self,
pipeline_id: PipelineId, pipeline_id: PipelineId,
load_data:LoadData, load_data:LoadData,
reply: Sender<webdriver_msg::LoadStatus>) { reply: IpcSender<webdriver_msg::LoadStatus>) {
let new_pipeline_id = self.load_url(pipeline_id, load_data); let new_pipeline_id = self.load_url(pipeline_id, load_data);
if let Some(id) = new_pipeline_id { if let Some(id) = new_pipeline_id {
self.webdriver.load_channel = Some((id, reply)); self.webdriver.load_channel = Some((id, reply));

32
components/webdriver_server/lib.rs
View file

@ -134,7 +134,7 @@ impl Handler {
} }
fn get_pipeline(&self, frame_id: Option<FrameId>) -> Option<PipelineId> { fn get_pipeline(&self, frame_id: Option<FrameId>) -> Option<PipelineId> {
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
const_chan.send(ConstellationMsg::GetPipeline(frame_id, sender)).unwrap(); const_chan.send(ConstellationMsg::GetPipeline(frame_id, sender)).unwrap();
@ -172,7 +172,7 @@ impl Handler {
let pipeline_id = try!(self.get_root_pipeline()); let pipeline_id = try!(self.get_root_pipeline());
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let load_data = LoadData::new(url); let load_data = LoadData::new(url);
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
@ -203,7 +203,7 @@ impl Handler {
fn handle_get_current_url(&self) -> WebDriverResult<WebDriverResponse> { fn handle_get_current_url(&self) -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_root_pipeline()); let pipeline_id = try!(self.get_root_pipeline());
let (sender, receiver) = channel(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd_msg = WebDriverCommandMsg::GetUrl(pipeline_id, sender); let cmd_msg = WebDriverCommandMsg::GetUrl(pipeline_id, sender);
@ -230,7 +230,7 @@ impl Handler {
fn handle_refresh(&self) -> WebDriverResult<WebDriverResponse> { fn handle_refresh(&self) -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_root_pipeline()); let pipeline_id = try!(self.get_root_pipeline());
let (sender, receiver) = channel(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd_msg = WebDriverCommandMsg::Refresh(pipeline_id, sender.clone()); let cmd_msg = WebDriverCommandMsg::Refresh(pipeline_id, sender.clone());
@ -242,7 +242,7 @@ impl Handler {
fn handle_get_title(&self) -> WebDriverResult<WebDriverResponse> { fn handle_get_title(&self) -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_root_pipeline()); let pipeline_id = try!(self.get_root_pipeline());
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id,
WebDriverScriptCommand::GetTitle(sender)); WebDriverScriptCommand::GetTitle(sender));
@ -273,7 +273,7 @@ impl Handler {
"Unsupported locator strategy")) "Unsupported locator strategy"))
} }
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd = WebDriverScriptCommand::FindElementCSS(parameters.value.clone(), sender); let cmd = WebDriverScriptCommand::FindElementCSS(parameters.value.clone(), sender);
let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
@ -313,7 +313,7 @@ impl Handler {
"Selecting frame by id not supported")); "Selecting frame by id not supported"));
} }
let pipeline_id = try!(self.get_frame_pipeline()); let pipeline_id = try!(self.get_frame_pipeline());
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let cmd = WebDriverScriptCommand::GetFrameId(frame_id, sender); let cmd = WebDriverScriptCommand::GetFrameId(frame_id, sender);
{ {
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
@ -323,7 +323,7 @@ impl Handler {
let frame = match receiver.recv().unwrap() { let frame = match receiver.recv().unwrap() {
Ok(Some((pipeline_id, subpage_id))) => { Ok(Some((pipeline_id, subpage_id))) => {
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
const_chan.send(ConstellationMsg::GetFrame(pipeline_id, subpage_id, sender)).unwrap(); const_chan.send(ConstellationMsg::GetFrame(pipeline_id, subpage_id, sender)).unwrap();
receiver.recv().unwrap() receiver.recv().unwrap()
@ -348,7 +348,7 @@ impl Handler {
"Unsupported locator strategy")) "Unsupported locator strategy"))
} }
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd = WebDriverScriptCommand::FindElementsCSS(parameters.value.clone(), sender); let cmd = WebDriverScriptCommand::FindElementsCSS(parameters.value.clone(), sender);
let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
@ -367,7 +367,7 @@ impl Handler {
fn handle_get_element_text(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> { fn handle_get_element_text(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_frame_pipeline()); let pipeline_id = try!(self.get_frame_pipeline());
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd = WebDriverScriptCommand::GetElementText(element.id.clone(), sender); let cmd = WebDriverScriptCommand::GetElementText(element.id.clone(), sender);
let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
@ -382,7 +382,7 @@ impl Handler {
fn handle_get_active_element(&self) -> WebDriverResult<WebDriverResponse> { fn handle_get_active_element(&self) -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_frame_pipeline()); let pipeline_id = try!(self.get_frame_pipeline());
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd = WebDriverScriptCommand::GetActiveElement(sender); let cmd = WebDriverScriptCommand::GetActiveElement(sender);
let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
@ -394,7 +394,7 @@ impl Handler {
fn handle_get_element_tag_name(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> { fn handle_get_element_tag_name(&self, element: &WebElement) -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_frame_pipeline()); let pipeline_id = try!(self.get_frame_pipeline());
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd = WebDriverScriptCommand::GetElementTagName(element.id.clone(), sender); let cmd = WebDriverScriptCommand::GetElementTagName(element.id.clone(), sender);
let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd); let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
@ -429,7 +429,7 @@ impl Handler {
// it with a vec of arguments. // it with a vec of arguments.
let script = format!("(function() {{ {} }})({})", func_body, args_string); let script = format!("(function() {{ {} }})({})", func_body, args_string);
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let command = WebDriverScriptCommand::ExecuteScript(script, sender); let command = WebDriverScriptCommand::ExecuteScript(script, sender);
self.execute_script(command, receiver) self.execute_script(command, receiver)
} }
@ -443,14 +443,14 @@ impl Handler {
"setTimeout(webdriverTimeout, {}); (function(callback) {{ {} }})({})", "setTimeout(webdriverTimeout, {}); (function(callback) {{ {} }})({})",
self.script_timeout, func_body, args_string); self.script_timeout, func_body, args_string);
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let command = WebDriverScriptCommand::ExecuteAsyncScript(script, sender); let command = WebDriverScriptCommand::ExecuteAsyncScript(script, sender);
self.execute_script(command, receiver) self.execute_script(command, receiver)
} }
fn execute_script(&self, fn execute_script(&self,
command: WebDriverScriptCommand, command: WebDriverScriptCommand,
reciever: IpcReceiver<WebDriverJSResult>) receiver: IpcReceiver<WebDriverJSResult>)
-> WebDriverResult<WebDriverResponse> { -> WebDriverResult<WebDriverResponse> {
let pipeline_id = try!(self.get_frame_pipeline()); let pipeline_id = try!(self.get_frame_pipeline());
@ -474,7 +474,7 @@ impl Handler {
let iterations = 30_000 / interval; let iterations = 30_000 / interval;
for _ in 0..iterations { for _ in 0..iterations {
let (sender, reciever) = ipc::channel().unwrap(); let (sender, receiver) = ipc::channel().unwrap();
let ConstellationChan(ref const_chan) = self.constellation_chan; let ConstellationChan(ref const_chan) = self.constellation_chan;
let cmd_msg = WebDriverCommandMsg::TakeScreenshot(pipeline_id, sender); let cmd_msg = WebDriverCommandMsg::TakeScreenshot(pipeline_id, sender);
const_chan.send(ConstellationMsg::WebDriverCommand(cmd_msg)).unwrap(); const_chan.send(ConstellationMsg::WebDriverCommand(cmd_msg)).unwrap();