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

Rustfmt script_traits.

Browse source
This commit is contained in:
Ms2ger 2017-01-03 14:07:14 +01:00
parent bf643f5356
commit 2dde348b12
3 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script_traits/webdriver_msg.rs
View file

@ -15,7 +15,7 @@ use servo_url::ServoUrl;
#[derive(Deserialize, Serialize)]
pub enum WebDriverScriptCommand {
AddCookie(#[serde(deserialize_with = "::hyper_serde::deserialize",
serialize_with = "::hyper_serde::serialize")]
serialize_with = "::hyper_serde::serialize")]
Cookie,
IpcSender<Result<(), WebDriverCookieError>>),
ExecuteScript(String, IpcSender<WebDriverJSResult>),
@ -35,13 +35,13 @@ pub enum WebDriverScriptCommand {
GetUrl(IpcSender<ServoUrl>),
IsEnabled(String, IpcSender<Result<bool, ()>>),
IsSelected(String, IpcSender<Result<bool, ()>>),
GetTitle(IpcSender<String>)
GetTitle(IpcSender<String>),
}
#[derive(Deserialize, Serialize)]
pub enum WebDriverCookieError {
InvalidDomain,
UnableToSetCookie
UnableToSetCookie,
}
#[derive(Deserialize, Serialize)]
@ -50,8 +50,7 @@ pub enum WebDriverJSValue {
Null,
Boolean(bool),
Number(f64),
String(String),
// TODO: Object and WebElement
String(String), // TODO: Object and WebElement
}
#[derive(Deserialize, Serialize)]
@ -60,7 +59,7 @@ pub enum WebDriverJSError {
UnknownType,
/// Occurs when handler received an event message for a layout channel that is not
/// associated with the current script thread
BrowsingContextNotFound
BrowsingContextNotFound,
}
pub type WebDriverJSResult = Result<WebDriverJSValue, WebDriverJSError>;
@ -69,7 +68,7 @@ pub type WebDriverJSResult = Result<WebDriverJSValue, WebDriverJSError>;
pub enum WebDriverFrameId {
Short(u16),
Element(String),
Parent
Parent,
}
impl ToJson for WebDriverJSValue {
@ -79,7 +78,7 @@ impl ToJson for WebDriverJSValue {
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()
WebDriverJSValue::String(ref x) => x.to_json(),
}
}
}
@ -87,5 +86,5 @@ impl ToJson for WebDriverJSValue {
#[derive(Deserialize, Serialize)]
pub enum LoadStatus {
LoadComplete,
LoadTimeout
LoadTimeout,
}