diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2016-10-18 15:37:19 +0200 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2016-10-21 16:12:39 +0200 |
| commit | dce2872f45ad8950cd2abff63f0e32328b7a87db (patch) | |
| tree | 34d99a4c3ddb26f091910a758409748c8e219d8c /components/msg | |
| parent | e3ebbd0fcdc78901c214d00cd11743a8fcf2d320 (diff) | |
| download | servo-dce2872f45ad8950cd2abff63f0e32328b7a87db.tar.gz servo-dce2872f45ad8950cd2abff63f0e32328b7a87db.zip | |
Move Image and PixelFormat to net_traits.
Diffstat (limited to 'components/msg')
| -rw-r--r-- | components/msg/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/msg/constellation_msg.rs | 20 | ||||
| -rw-r--r-- | components/msg/lib.rs | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index cf283ea6e73..ddc0b3e3f85 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -14,7 +14,6 @@ bitflags = "0.7" cssparser = {version = "0.7", features = ["heap_size", "serde-serialization"]} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.5" plugins = {path = "../plugins"} serde = "0.8" serde_derive = "0.8" diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index 2aa8d19c8d2..63904e2440c 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -5,7 +5,6 @@ //! The high-level interface from script to constellation. Using this abstract interface helps //! reduce coupling between these two components. -use ipc_channel::ipc::IpcSharedMemory; use std::cell::Cell; use std::fmt; use webrender_traits; @@ -163,25 +162,6 @@ bitflags! { } } -#[derive(Clone, Copy, Deserialize, Eq, PartialEq, Serialize, HeapSizeOf)] -pub enum PixelFormat { - K8, // Luminance channel only - KA8, // Luminance + alpha - RGB8, // RGB, 8 bits per channel - RGBA8, // RGB + alpha, 8 bits per channel -} - -#[derive(Clone, Deserialize, Serialize, HeapSizeOf)] -pub struct Image { - pub width: u32, - pub height: u32, - pub format: PixelFormat, - #[ignore_heap_size_of = "Defined in ipc-channel"] - pub bytes: IpcSharedMemory, - #[ignore_heap_size_of = "Defined in webrender_traits"] - pub id: Option<webrender_traits::ImageKey>, -} - #[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize)] pub enum TraversalDirection { Forward(usize), diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 3918a7ada77..a2cc4bbab71 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -11,7 +11,6 @@ #[macro_use] extern crate bitflags; extern crate heapsize; -extern crate ipc_channel; extern crate serde; #[macro_use] extern crate serde_derive; |