aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/constellation/constellation.rs2
-rw-r--r--components/msg/Cargo.toml3
-rw-r--r--components/msg/lib.rs4
-rw-r--r--components/script/dom/window.rs2
-rw-r--r--components/script/script_thread.rs2
-rw-r--r--components/script/webdriver_handlers.rs4
-rw-r--r--components/script_traits/Cargo.toml2
-rw-r--r--components/script_traits/lib.rs5
-rw-r--r--components/script_traits/webdriver_msg.rs (renamed from components/msg/webdriver_msg.rs)4
-rw-r--r--components/servo/Cargo.lock5
-rw-r--r--components/webdriver_server/lib.rs4
-rw-r--r--ports/cef/Cargo.lock5
12 files changed, 20 insertions, 22 deletions
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 9c7ca3fa3ad..7c3a95dbc54 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -29,7 +29,6 @@ use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
use msg::constellation_msg::{PipelineNamespace, PipelineNamespaceId, NavigationDirection};
use msg::constellation_msg::{SubpageId, WindowSizeType};
use msg::constellation_msg::{self, PanicMsg};
-use msg::webdriver_msg;
use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::filemanager_thread::FileManagerThreadMsg;
use net_traits::image_cache_thread::ImageCacheThread;
@@ -40,6 +39,7 @@ use pipeline::{ChildProcess, InitialPipelineState, Pipeline};
use profile_traits::mem;
use profile_traits::time;
use rand::{random, Rng, SeedableRng, StdRng};
+use script_traits::webdriver_msg;
use script_traits::{AnimationState, AnimationTickType, CompositorEvent};
use script_traits::{ConstellationControlMsg, ConstellationMsg as FromCompositorMsg};
use script_traits::{DocumentState, LayoutControlMsg};
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index dfa430505ca..72359201734 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -10,15 +10,12 @@ path = "lib.rs"
[dependencies]
bitflags = "0.7"
-cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]}
cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
-euclid = "0.7.1"
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
hyper = {version = "0.9.9", features = ["serde-serialization"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
plugins = {path = "../plugins"}
-rustc-serialize = "0.3.4"
serde = "0.7.11"
serde_macros = "0.7.11"
url = {version = "1.0.0", features = ["heap_size", "serde"]}
diff --git a/components/msg/lib.rs b/components/msg/lib.rs
index a3eda6b1796..13923b16b6e 100644
--- a/components/msg/lib.rs
+++ b/components/msg/lib.rs
@@ -10,15 +10,11 @@
#[allow(unused_extern_crates)]
#[macro_use]
extern crate bitflags;
-extern crate cookie as cookie_rs;
-extern crate euclid;
extern crate heapsize;
extern crate hyper;
extern crate ipc_channel;
-extern crate rustc_serialize;
extern crate serde;
extern crate url;
extern crate webrender_traits;
pub mod constellation_msg;
-pub mod webdriver_msg;
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 181e29f9263..4eaa1c6e568 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -44,7 +44,6 @@ use js::rust::CompileOptionsWrapper;
use js::rust::Runtime;
use libc;
use msg::constellation_msg::{FrameType, LoadData, PanicMsg, PipelineId, SubpageId, WindowSizeType};
-use msg::webdriver_msg::{WebDriverJSError, WebDriverJSResult};
use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread};
use net_traits::storage_thread::StorageType;
@@ -63,6 +62,7 @@ use script_layout_interface::rpc::{MarginStyleResponse, ResolvedStyleResponse};
use script_runtime::{ScriptChan, ScriptPort, maybe_take_panic_result};
use script_thread::SendableMainThreadScriptChan;
use script_thread::{MainThreadScriptChan, MainThreadScriptMsg, RunnableWrapper};
+use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult};
use script_traits::{ConstellationControlMsg, UntrustedNodeAddress};
use script_traits::{DocumentState, MsDuration, TimerEvent, TimerEventId};
use script_traits::{ScriptMsg as ConstellationMsg, TimerEventRequest, TimerSource, WindowSizeData};
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 92bfaf87244..2367ecc0fd9 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -66,7 +66,6 @@ use js::rust::Runtime;
use mem::heap_size_of_self_and_children;
use msg::constellation_msg::{FrameType, LoadData, PanicMsg, PipelineId, PipelineNamespace};
use msg::constellation_msg::{SubpageId, WindowSizeType};
-use msg::webdriver_msg::WebDriverScriptCommand;
use net_traits::LoadData as NetLoadData;
use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheResult, ImageCacheThread};
@@ -83,6 +82,7 @@ use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
use script_runtime::{ScriptPort, StackRootTLS, new_rt_and_cx, get_reports};
use script_traits::CompositorEvent::{KeyEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent};
use script_traits::CompositorEvent::{TouchEvent, TouchpadPressureEvent};
+use script_traits::webdriver_msg::WebDriverScriptCommand;
use script_traits::{CompositorEvent, ConstellationControlMsg, EventResult};
use script_traits::{InitialScriptState, MouseButton, MouseEventType, MozBrowserEvent};
use script_traits::{NewLayoutInfo, ScriptMsg as ConstellationMsg};
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index 16395e53bc0..2711cfb1225 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -31,12 +31,12 @@ use ipc_channel::ipc::{self, IpcSender};
use js::jsapi::{JSContext, HandleValue};
use js::jsval::UndefinedValue;
use msg::constellation_msg::PipelineId;
-use msg::webdriver_msg::WebDriverCookieError;
-use msg::webdriver_msg::{WebDriverFrameId, WebDriverJSError, WebDriverJSResult, WebDriverJSValue};
use net_traits::CookieSource::{HTTP, NonHTTP};
use net_traits::CoreResourceMsg::{GetCookiesDataForUrl, SetCookiesForUrlWithData};
use net_traits::IpcSend;
use script_thread::get_browsing_context;
+use script_traits::webdriver_msg::WebDriverCookieError;
+use script_traits::webdriver_msg::{WebDriverFrameId, WebDriverJSError, WebDriverJSResult, WebDriverJSValue};
use url::Url;
fn find_node_by_unique_id(context: &BrowsingContext,
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
index 3c28cc00f23..8df51d11d6e 100644
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@@ -11,6 +11,7 @@ path = "lib.rs"
[dependencies]
app_units = "0.2.5"
canvas_traits = {path = "../canvas_traits"}
+cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]}
devtools_traits = {path = "../devtools_traits"}
euclid = "0.7.1"
gfx_traits = {path = "../gfx_traits"}
@@ -24,6 +25,7 @@ net_traits = {path = "../net_traits"}
offscreen_gl_context = "0.1.2"
plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
+rustc-serialize = "0.3.4"
serde = "0.7.11"
serde_macros = "0.7.11"
style_traits = {path = "../style_traits", features = ["servo"]}
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 938d754ce71..bd82a498d46 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -13,6 +13,7 @@
extern crate app_units;
extern crate canvas_traits;
+extern crate cookie as cookie_rs;
extern crate devtools_traits;
extern crate euclid;
extern crate gfx_traits;
@@ -24,6 +25,7 @@ extern crate msg;
extern crate net_traits;
extern crate offscreen_gl_context;
extern crate profile_traits;
+extern crate rustc_serialize;
extern crate serde;
extern crate style_traits;
extern crate time;
@@ -31,6 +33,7 @@ extern crate url;
extern crate util;
mod script_msg;
+pub mod webdriver_msg;
use app_units::Au;
use devtools_traits::ScriptToDevtoolsControlMsg;
@@ -50,7 +53,6 @@ use libc::c_void;
use msg::constellation_msg::{FrameId, FrameType, Image, Key, KeyModifiers, KeyState, LoadData};
use msg::constellation_msg::{NavigationDirection, PanicMsg, PipelineId};
use msg::constellation_msg::{PipelineNamespaceId, SubpageId, WindowSizeType};
-use msg::webdriver_msg::{LoadStatus, WebDriverScriptCommand};
use net_traits::ResourceThreads;
use net_traits::bluetooth_thread::BluetoothMethodMsg;
use net_traits::image_cache_thread::ImageCacheThread;
@@ -62,6 +64,7 @@ use std::sync::mpsc::{Sender, Receiver};
use url::Url;
use util::geometry::{PagePx, ViewportPx};
use util::ipc::OptionalOpaqueIpcSender;
+use webdriver_msg::{LoadStatus, WebDriverScriptCommand};
pub use script_msg::{LayoutMsg, ScriptMsg, EventResult};
diff --git a/components/msg/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs
index ea848ce431d..0694c97f29d 100644
--- a/components/msg/webdriver_msg.rs
+++ b/components/script_traits/webdriver_msg.rs
@@ -2,10 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use constellation_msg::PipelineId;
+#![allow(missing_docs)]
+
use cookie_rs::Cookie;
use euclid::rect::Rect;
use ipc_channel::ipc::IpcSender;
+use msg::constellation_msg::PipelineId;
use rustc_serialize::json::{Json, ToJson};
use url::Url;
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 70a5c4e9d58..4dcd8197b2e 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1377,15 +1377,12 @@ name = "msg"
version = "0.0.1"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)",
"plugins 0.0.1",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2004,6 +2001,7 @@ version = "0.0.1"
dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
+ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
@@ -2017,6 +2015,7 @@ dependencies = [
"offscreen_gl_context 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"profile_traits 0.0.1",
+ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index 39a91e2143b..5e862f36d9d 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -33,11 +33,11 @@ use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use keys::keycodes_to_keys;
use msg::constellation_msg::{FrameId, LoadData, PipelineId};
use msg::constellation_msg::{NavigationDirection, PixelFormat};
-use msg::webdriver_msg::{LoadStatus, WebDriverCookieError, WebDriverFrameId};
-use msg::webdriver_msg::{WebDriverJSError, WebDriverJSResult, WebDriverScriptCommand};
use regex::Captures;
use rustc_serialize::base64::{CharacterSet, Config, Newline, ToBase64};
use rustc_serialize::json::{Json, ToJson};
+use script_traits::webdriver_msg::{LoadStatus, WebDriverCookieError, WebDriverFrameId};
+use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult, WebDriverScriptCommand};
use script_traits::{ConstellationMsg, WebDriverCommandMsg};
use std::borrow::ToOwned;
use std::collections::BTreeMap;
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index fc12206253c..8ddc81e43ac 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1279,15 +1279,12 @@ name = "msg"
version = "0.0.1"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.3 (git+https://github.com/servo/ipc-channel)",
"plugins 0.0.1",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1848,6 +1845,7 @@ version = "0.0.1"
dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas_traits 0.0.1",
+ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
@@ -1861,6 +1859,7 @@ dependencies = [
"offscreen_gl_context 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"plugins 0.0.1",
"profile_traits 0.0.1",
+ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 05:34:59 +0000