diff options
Diffstat (limited to 'components/webdriver_server')
-rw-r--r-- | components/webdriver_server/Cargo.toml | 6 | ||||
-rw-r--r-- | components/webdriver_server/lib.rs | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 02b90a58fe3..c878a73da9a 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -26,9 +26,9 @@ git = "https://github.com/servo/ipc-channel" [dependencies] image = "0.9" log = "0.3.5" -hyper = "0.8" +hyper = "0.9" rustc-serialize = "0.3.4" regex = "0.1.55" -url = {version = "0.5.7", features = ["heap_size"]} +url = {version = "1.0.0", features = ["heap_size"]} uuid = { version = "0.2", features = ["v4"] } -webdriver = "0.8" +webdriver = "0.9" diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 03ea0291caf..659922f452a 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -14,8 +14,6 @@ extern crate compositing; extern crate hyper; extern crate image; extern crate ipc_channel; -#[macro_use] -extern crate log; extern crate msg; extern crate regex; extern crate rustc_serialize; @@ -324,7 +322,7 @@ impl Handler { let (sender, receiver) = ipc::channel().unwrap(); - let load_data = LoadData::new(url); + let load_data = LoadData::new(url, None, None); let cmd_msg = WebDriverCommandMsg::LoadUrl(pipeline_id, load_data, sender.clone()); self.constellation_chan.send(ConstellationMsg::WebDriverCommand(cmd_msg)).unwrap(); @@ -355,7 +353,7 @@ impl Handler { let url = receiver.recv().unwrap(); - Ok(WebDriverResponse::Generic(ValueResponse::new(url.serialize().to_json()))) + Ok(WebDriverResponse::Generic(ValueResponse::new(url.as_str().to_json()))) } fn handle_window_size(&self) -> WebDriverResult<WebDriverResponse> { |