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

Add support for timing out scripts

Browse source
This commit is contained in:
James Graham 2015-04-30 16:26:04 +01:00
parent 8d10fa1f2d
commit 50f59c8255
5 changed files with 82 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/webdriver_traits/lib.rs
View file

@ -11,8 +11,8 @@ use rustc_serialize::json::{Json, ToJson};
use std::sync::mpsc::Sender;
pub enum WebDriverScriptCommand {
ExecuteScript(String, Sender<Result<EvaluateJSReply, ()>>),
ExecuteAsyncScript(String, Sender<Result<EvaluateJSReply, ()>>),
ExecuteScript(String, Sender<WebDriverJSResult>),
ExecuteAsyncScript(String, Sender<WebDriverJSResult>),
FindElementCSS(String, Sender<Result<Option<String>, ()>>),
FindElementsCSS(String, Sender<Result<Vec<String>, ()>>),
GetActiveElement(Sender<Option<String>>),
@ -21,23 +21,30 @@ pub enum WebDriverScriptCommand {
GetTitle(Sender<String>)
}
pub enum EvaluateJSReply {
VoidValue,
NullValue,
BooleanValue(bool),
NumberValue(f64),
StringValue(String),
pub enum WebDriverJSValue {
Undefined,
Null,
Boolean(bool),
Number(f64),
String(String),
// TODO: ObjectValue and WebElementValue
}
impl ToJson for EvaluateJSReply {
pub enum WebDriverJSError {
Timeout,
UnknownType
}
pub type WebDriverJSResult = Result<WebDriverJSValue, WebDriverJSError>;
impl ToJson for WebDriverJSValue {
fn to_json(&self) -> Json {
match self {
&EvaluateJSReply::VoidValue => Json::Null,
&EvaluateJSReply::NullValue => Json::Null,
&EvaluateJSReply::BooleanValue(ref x) => x.to_json(),
&EvaluateJSReply::NumberValue(ref x) => x.to_json(),
&EvaluateJSReply::StringValue(ref x) => x.to_json()
&WebDriverJSValue::Undefined => Json::Null,
&WebDriverJSValue::Null => Json::Null,
&WebDriverJSValue::Boolean(ref x) => x.to_json(),
&WebDriverJSValue::Number(ref x) => x.to_json(),
&WebDriverJSValue::String(ref x) => x.to_json()
}
}
}