Move Image and PixelFormat to net_traits.

components/net_traits/Cargo.toml

@@ -27,3 +27,8 @@ url = {version = "1.2", features = ["heap_size"]}
 websocket = "0.17"
 uuid = { version = "0.3.1", features = ["v4", "serde"] }
 cookie = {version = "0.2.5", features = ["serialize-rustc"]}
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender"
+default_features = false
+features = ["serde_derive"]

components/net_traits/image/base.rs

@@ -4,8 +4,26 @@
 
 use ipc_channel::ipc::IpcSharedMemory;
 use piston_image::{self, DynamicImage, ImageFormat};
+use webrender_traits;
 
-pub use msg::constellation_msg::{Image, PixelFormat};
+#[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, Deserialize, Eq, PartialEq, Serialize, HeapSizeOf)]
 pub struct ImageMetadata {

components/net_traits/image_cache_thread.rs

@@ -2,9 +2,8 @@
  * 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 image::base::ImageMetadata;
+use image::base::{Image, ImageMetadata};
 use ipc_channel::ipc::{self, IpcSender};
-use msg::constellation_msg::Image;
 use std::sync::Arc;
 use url::Url;
 

components/net_traits/lib.rs

@@ -34,6 +34,7 @@ extern crate serde_derive;
 extern crate url;
 extern crate util;
 extern crate uuid;
+extern crate webrender_traits;
 extern crate websocket;
 
 use cookie_rs::Cookie;