aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits/webdriver_msg.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-08-12 14:46:25 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-08-12 18:37:27 +0200
commit7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5 (patch)
tree7c3323204e3fb5d85edcb95b97748962e3978ae1 /components/script_traits/webdriver_msg.rs
parenta22913569c2fa917015b23c27cb2f55de2a69ff2 (diff)
downloadservo-7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5.tar.gz
servo-7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5.zip
Update serde to 0.8 (fixes #12659)
Diffstat (limited to 'components/script_traits/webdriver_msg.rs')
-rw-r--r--components/script_traits/webdriver_msg.rs12
1 files changed, 9 insertions, 3 deletions
diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs
index 09d3c9e9e1c..788dbd5ad36 100644
--- a/components/script_traits/webdriver_msg.rs
+++ b/components/script_traits/webdriver_msg.rs
@@ -6,6 +6,7 @@
use cookie_rs::Cookie;
use euclid::rect::Rect;
+use hyper_serde::Serde;
use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId;
use rustc_serialize::json::{Json, ToJson};
@@ -13,15 +14,20 @@ use url::Url;
#[derive(Deserialize, Serialize)]
pub enum WebDriverScriptCommand {
- AddCookie(Cookie, IpcSender<Result<(), WebDriverCookieError>>),
+ AddCookie(
+ #[serde(deserialize_with = "::hyper_serde::deserialize",
+ serialize_with = "::hyper_serde::serialize")]
+ Cookie,
+ IpcSender<Result<(), WebDriverCookieError>>
+ ),
ExecuteScript(String, IpcSender<WebDriverJSResult>),
ExecuteAsyncScript(String, IpcSender<WebDriverJSResult>),
FindElementCSS(String, IpcSender<Result<Option<String>, ()>>),
FindElementsCSS(String, IpcSender<Result<Vec<String>, ()>>),
FocusElement(String, IpcSender<Result<(), ()>>),
GetActiveElement(IpcSender<Option<String>>),
- GetCookie(String, IpcSender<Vec<Cookie>>),
- GetCookies(IpcSender<Vec<Cookie>>),
+ GetCookie(String, IpcSender<Vec<Serde<Cookie>>>),
+ GetCookies(IpcSender<Vec<Serde<Cookie>>>),
GetElementAttribute(String, String, IpcSender<Result<Option<String>, ()>>),
GetElementCSS(String, String, IpcSender<Result<String, ()>>),
GetElementRect(String, IpcSender<Result<Rect<f64>, ()>>),