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

When webdriver is getting a pipeline id, it should wait for the pipeline document to be ready.

Browse source
This commit is contained in:
Alan Jeffrey 2016-05-11 15:27:25 -05:00
parent 3bd6c2088b
commit 00a8efe9fd
3 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

39
components/webdriver_server/lib.rs
View file

@ -223,32 +223,31 @@ impl Handler {
}
}
fn root_pipeline(&self) -> WebDriverResult<PipelineId> {
fn pipeline(&self, frame_id: Option<FrameId>) -> WebDriverResult<PipelineId> {
let interval = 20;
let iterations = 30_000 / interval;
let (sender, receiver) = ipc::channel().unwrap();
for _ in 0..iterations {
if let Some(x) = self.pipeline(None) {
return Ok(x)
};
let msg = ConstellationMsg::GetPipeline(frame_id, sender.clone());
self.constellation_chan.send(msg).unwrap();
// Wait until the document is ready before returning the pipeline id.
if let Some((x, true)) = receiver.recv().unwrap() {
return Ok(x);
}
thread::sleep(Duration::from_millis(interval));
};
}
Err(WebDriverError::new(ErrorStatus::Timeout,
"Failed to get root window handle"))
"Failed to get window handle"))
}
fn root_pipeline(&self) -> WebDriverResult<PipelineId> {
self.pipeline(None)
}
fn frame_pipeline(&self) -> WebDriverResult<PipelineId> {
if let Some(ref session) = self.session {
match self.pipeline(session.frame_id) {
Some(x) => Ok(x),
None => Err(WebDriverError::new(ErrorStatus::NoSuchFrame,
"Frame got closed"))
}
} else {
panic!("Command tried to access session but session is None");
}
self.pipeline(self.session.as_ref().and_then(|session| session.frame_id))
}
fn session(&self) -> WebDriverResult<&WebDriverSession> {
@ -270,14 +269,6 @@ impl Handler {
}
}
fn pipeline(&self, frame_id: Option<FrameId>) -> Option<PipelineId> {
let (sender, receiver) = ipc::channel().unwrap();
self.constellation_chan.send(ConstellationMsg::GetPipeline(frame_id, sender)).unwrap();
receiver.recv().unwrap()
}
fn handle_new_session(&mut self) -> WebDriverResult<WebDriverResponse> {
if self.session.is_none() {
let session = WebDriverSession::new();