Remove the ConvertPipelineIdToWebRender trait.

components/compositing/Cargo.toml

@@ -11,7 +11,6 @@ path = "lib.rs"
 [dependencies]
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
-layout_traits = {path = "../layout_traits"}
 script_traits = {path = "../script_traits"}
 style_traits = {path = "../style_traits"}
 msg = {path = "../msg"}

components/compositing/compositor.rs

@@ -27,7 +27,6 @@ use layers::platform::surface::NativeDisplay;
 use layers::rendergl;
 use layers::rendergl::RenderContext;
 use layers::scene::Scene;
-use layout_traits::ConvertPipelineIdToWebRender;
 use msg::constellation_msg::{Image, PixelFormat};
 use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
 use msg::constellation_msg::{NavigationDirection, PipelineId, PipelineIndex, PipelineNamespaceId};

components/compositing/lib.rs

@@ -21,7 +21,6 @@ extern crate gleam;
 extern crate image;
 extern crate ipc_channel;
 extern crate layers;
-extern crate layout_traits;
 #[macro_use]
 extern crate log;
 extern crate msg;

components/layout/layout_thread.rs

@@ -35,7 +35,7 @@ use incremental::{REPAINT, STORE_OVERFLOW, REFLOW_OUT_OF_FLOW, REFLOW, REFLOW_EN
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use layout_debug;
-use layout_traits::{ConvertPipelineIdToWebRender, LayoutThreadFactory};
+use layout_traits::LayoutThreadFactory;
 use log;
 use msg::constellation_msg::{PanicMsg, PipelineId};
 use net_traits::image_cache_thread::UsePlaceholder;

components/layout/webrender_helpers.rs

@@ -14,7 +14,6 @@ use gfx::display_list::{BorderRadii, BoxShadowClipMode, ClippingRegion};
 use gfx::display_list::{DisplayItem, DisplayList};
 use gfx::display_list::{DisplayListTraversal, GradientStop, StackingContext, StackingContextType};
 use gfx_traits::ScrollPolicy;
-use layout_traits::ConvertPipelineIdToWebRender;
 use style::computed_values::filter::{self, Filter};
 use style::computed_values::{image_rendering, mix_blend_mode};
 use style::values::computed::BorderStyle;

components/layout_traits/lib.rs

@@ -22,7 +22,7 @@ extern crate webrender_traits;
 use gfx::font_cache_thread::FontCacheThread;
 use gfx::paint_thread::LayoutToPaintMsg;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use msg::constellation_msg::{PanicMsg, PipelineId, PipelineNamespaceId, PipelineIndex};
+use msg::constellation_msg::{PanicMsg, PipelineId};
 use net_traits::image_cache_thread::ImageCacheThread;
 use profile_traits::{mem, time};
 use script_traits::LayoutMsg as ConstellationMsg;
@@ -52,15 +52,3 @@ pub trait LayoutThreadFactory {
               content_process_shutdown_chan: IpcSender<()>,
               webrender_api_sender: Option<webrender_traits::RenderApiSender>);
 }
-
-pub trait ConvertPipelineIdToWebRender {
-    fn to_webrender(&self) -> webrender_traits::PipelineId;
-}
-
-impl ConvertPipelineIdToWebRender for PipelineId {
-    fn to_webrender(&self) -> webrender_traits::PipelineId {
-        let PipelineNamespaceId(namespace_id) = self.namespace_id;
-        let PipelineIndex(index) = self.index;
-        webrender_traits::PipelineId(namespace_id, index)
-    }
-}

components/msg/constellation_msg.rs

@@ -331,6 +331,12 @@ impl PipelineId {
             index: PipelineIndex(0),
         }
     }
+
+    pub fn to_webrender(&self) -> webrender_traits::PipelineId {
+        let PipelineNamespaceId(namespace_id) = self.namespace_id;
+        let PipelineIndex(index) = self.index;
+        webrender_traits::PipelineId(namespace_id, index)
+    }
 }
 
 impl fmt::Display for PipelineId {

components/servo/Cargo.lock

@@ -315,7 +315,6 @@ dependencies = [
  "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
  "layers 0.2.5 (git+https://github.com/servo/rust-layers)",
- "layout_traits 0.0.1",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "net_traits 0.0.1",

ports/cef/Cargo.lock

@@ -277,7 +277,6 @@ dependencies = [
  "image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
  "layers 0.2.5 (git+https://github.com/servo/rust-layers)",
- "layout_traits 0.0.1",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "net_traits 0.0.1",