Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Import net as net rather than servo_net.

Browse source
This commit is contained in:
Ms2ger 2015-02-10 12:16:11 +01:00
parent 29d3b872de
commit a09a912178
30 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/context.rs
View file

@ -15,7 +15,7 @@ use gfx::font_cache_task::FontCacheTask;
use script::layout_interface::LayoutChan;
use script_traits::UntrustedNodeAddress;
use msg::constellation_msg::ConstellationChan;
use servo_net::local_image_cache::LocalImageCache;
use net::local_image_cache::LocalImageCache;
use servo_util::geometry::Au;
use std::cell::Cell;
use std::mem;

2
components/layout/display_list_builder.rs
View file

@ -38,7 +38,7 @@ use png::PixelsByColorType;
use msg::compositor_msg::ScrollPolicy;
use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::ConstellationChan;
use servo_net::image::holder::ImageHolder;
use net::image::holder::ImageHolder;
use servo_util::cursor::Cursor;
use servo_util::geometry::{self, Au, to_px, to_frac_px};
use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};

4
components/layout/fragment.rs
View file

@ -30,8 +30,8 @@ use gfx::text::text_run::{TextRun, TextRunSlice};
use script_traits::UntrustedNodeAddress;
use serialize::{Encodable, Encoder};
use msg::constellation_msg::{PipelineId, SubpageId};
use servo_net::image::holder::ImageHolder;
use servo_net::local_image_cache::LocalImageCache;
use net::image::holder::ImageHolder;
use net::local_image_cache::LocalImageCache;
use servo_util::geometry::{self, Au, ZERO_POINT};
use servo_util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin};
use servo_util::range::*;

6
components/layout/layout_task.rs
View file

@ -48,9 +48,9 @@ use script_traits::{ScriptControlChan, UntrustedNodeAddress};
use msg::compositor_msg::ScrollPolicy;
use msg::constellation_msg::Msg as ConstellationMsg;
use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
use servo_net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
use servo_net::local_image_cache::{ImageResponder, LocalImageCache};
use servo_net::resource_task::{ResourceTask, load_bytes_iter};
use net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
use net::local_image_cache::{ImageResponder, LocalImageCache};
use net::resource_task::{ResourceTask, load_bytes_iter};
use servo_util::cursor::Cursor;
use servo_util::geometry::Au;
use servo_util::logical_geometry::LogicalPoint;

2
components/layout/lib.rs
View file

@ -26,7 +26,7 @@ extern crate style;
#[macro_use]
#[no_link] #[plugin]
extern crate "plugins" as servo_plugins;
extern crate "net" as servo_net;
extern crate net;
extern crate msg;
#[macro_use]
extern crate "util" as servo_util;