From 8d4aeef08b8bf00d7db0d213c6ce92294b8eecb5 Mon Sep 17 00:00:00 2001 From: Kunal Mohan Date: Tue, 28 Jan 2020 23:32:22 +0530 Subject: move ConstellationMsg to compositing --- components/webdriver_server/Cargo.toml | 1 + components/webdriver_server/actions.rs | 3 ++- components/webdriver_server/lib.rs | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'components/webdriver_server') diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 3df9701b2bf..e023a2fc377 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -12,6 +12,7 @@ path = "lib.rs" [dependencies] base64 = "0.10" +compositing = {path = "../compositing"} cookie = "0.11" crossbeam-channel = "0.3" euclid = "0.20" diff --git a/components/webdriver_server/actions.rs b/components/webdriver_server/actions.rs index e04c40d54c8..4fae56b7cee 100644 --- a/components/webdriver_server/actions.rs +++ b/components/webdriver_server/actions.rs @@ -3,10 +3,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::Handler; +use compositing::ConstellationMsg; use ipc_channel::ipc; use keyboard_types::webdriver::KeyInputState; use script_traits::webdriver_msg::WebDriverScriptCommand; -use script_traits::{ConstellationMsg, MouseButton, MouseEventType, WebDriverCommandMsg}; +use script_traits::{MouseButton, MouseEventType, WebDriverCommandMsg}; use std::cmp; use std::collections::HashSet; use std::thread; diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index c6813488df7..6cf3db4bc18 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -21,6 +21,7 @@ mod capabilities; use crate::actions::{InputSourceState, PointerInputState}; use base64; use capabilities::ServoCapabilities; +use compositing::ConstellationMsg; use crossbeam_channel::{after, unbounded, Receiver, Sender}; use euclid::{Rect, Size2D}; use hyper::Method; @@ -34,7 +35,7 @@ use script_traits::webdriver_msg::{LoadStatus, WebDriverCookieError, WebDriverFr use script_traits::webdriver_msg::{ WebDriverJSError, WebDriverJSResult, WebDriverJSValue, WebDriverScriptCommand, }; -use script_traits::{ConstellationMsg, LoadData, LoadOrigin, WebDriverCommandMsg}; +use script_traits::{LoadData, LoadOrigin, WebDriverCommandMsg}; use serde::de::{Deserialize, Deserializer, MapAccess, Visitor}; use serde::ser::{Serialize, Serializer}; use serde_json::{json, Value}; -- cgit v1.2.3