diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-03 13:00:46 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-03 13:00:46 -0600 |
commit | d707d1b78e3393a1ed164af8ec855bd0ff119e55 (patch) | |
tree | 4552a091047a62f8c431d5a36cd853884a75296e /components/compositing/pipeline.rs | |
parent | 74f8c0eeb714fb7ca7964b36f1b82849e8a345ee (diff) | |
parent | 51625d7d062ca9144087cbd5527e097a5a7d2d16 (diff) | |
download | servo-d707d1b78e3393a1ed164af8ec855bd0ff119e55.tar.gz servo-d707d1b78e3393a1ed164af8ec855bd0ff119e55.zip |
auto merge of #5465 : gilles-leblanc/servo/issue-4476-b, r=jdm
Fixes #4476
Diffstat (limited to 'components/compositing/pipeline.rs')
-rw-r--r-- | components/compositing/pipeline.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index 2bd4f7dd1cf..3b3a5d0a4f6 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -16,11 +16,11 @@ use gfx::font_cache_task::FontCacheTask; use layers::geometry::DevicePixel; use msg::constellation_msg::{ConstellationChan, Failure, FrameId, PipelineId, SubpageId}; use msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType, MozBrowserEvent}; -use net::image_cache_task::ImageCacheTask; -use net::resource_task::ResourceTask; -use net::storage_task::StorageTask; use profile::mem; use profile::time; +use net_traits::ResourceTask; +use net_traits::image_cache_task::ImageCacheTask; +use net_traits::storage_task::StorageTask; use std::sync::mpsc::{Receiver, channel}; use url::Url; use util::geometry::{PagePx, ViewportPx}; |