aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/Cargo.toml4
-rw-r--r--components/layout/context.rs2
-rw-r--r--components/layout/display_list_builder.rs2
-rw-r--r--components/layout/fragment.rs4
-rw-r--r--components/layout/layout_task.rs6
-rw-r--r--components/layout/lib.rs3
6 files changed, 10 insertions, 11 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 88f28089a3f..62a0e16ee65 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -34,8 +34,8 @@ path = "../style"
[dependencies.plugins]
path = "../plugins"
-[dependencies.net]
-path = "../net"
+[dependencies.net_traits]
+path = "../net_traits"
[dependencies.profile]
path = "../profile"
diff --git a/components/layout/context.rs b/components/layout/context.rs
index ae1c75e89e6..4d8f161f642 100644
--- a/components/layout/context.rs
+++ b/components/layout/context.rs
@@ -13,9 +13,9 @@ use gfx::display_list::OpaqueNode;
use gfx::font_cache_task::FontCacheTask;
use gfx::font_context::FontContext;
use msg::constellation_msg::ConstellationChan;
-use net::local_image_cache::LocalImageCache;
use script::layout_interface::{Animation, LayoutChan};
use script_traits::UntrustedNodeAddress;
+use net_traits::local_image_cache::LocalImageCache;
use std::boxed;
use std::cell::Cell;
use std::ptr;
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 7b890392c03..edef3c31521 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -36,7 +36,7 @@ use png::{self, PixelsByColorType};
use msg::compositor_msg::ScrollPolicy;
use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::ConstellationChan;
-use net::image::holder::ImageHolder;
+use net_traits::image::holder::ImageHolder;
use util::cursor::Cursor;
use util::geometry::{self, Au, ZERO_POINT, to_px, to_frac_px};
use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index b1f43a26c86..14265aed4bc 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -30,8 +30,8 @@ use gfx::text::text_run::{TextRun, TextRunSlice};
use script_traits::UntrustedNodeAddress;
use rustc_serialize::{Encodable, Encoder};
use msg::constellation_msg::{ConstellationChan, Msg, PipelineId, SubpageId};
-use net::image::holder::ImageHolder;
-use net::local_image_cache::LocalImageCache;
+use net_traits::image::holder::ImageHolder;
+use net_traits::local_image_cache::LocalImageCache;
use util::geometry::{self, Au, ZERO_POINT};
use util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin, WritingMode};
use util::range::*;
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 5360e2f2fdb..a2f7b7ca81e 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -41,12 +41,12 @@ use log;
use msg::compositor_msg::ScrollPolicy;
use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
-use net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
-use net::local_image_cache::{ImageResponder, LocalImageCache};
-use net::resource_task::{ResourceTask, load_bytes_iter};
use profile::mem::{self, Report, ReportsChan};
use profile::time::{self, ProfilerMetadata, profile};
use profile::time::{TimerMetadataFrameType, TimerMetadataReflowType};
+use net_traits::{load_bytes_iter, ResourceTask};
+use net_traits::image_cache_task::{ImageCacheTask, ImageResponseMsg};
+use net_traits::local_image_cache::{ImageResponder, LocalImageCache};
use script::dom::bindings::js::LayoutJS;
use script::dom::node::{LayoutData, Node};
use script::layout_interface::{Animation, ContentBoxResponse, ContentBoxesResponse};
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 631844dd67c..7fbbb2d3576 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -30,7 +30,7 @@ extern crate bitflags;
#[macro_use]
#[no_link]
extern crate "plugins" as servo_plugins;
-
+extern crate net_traits;
#[macro_use]
extern crate profile;
@@ -50,7 +50,6 @@ extern crate gfx;
extern crate layout_traits;
extern crate libc;
extern crate msg;
-extern crate net;
extern crate png;
extern crate script;
extern crate script_traits;