diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 21:43:04 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-08 09:28:00 +0100 |
| commit | 2012be4a8bd97f2fd69f986c8fffb1af1eec21dc (patch) | |
| tree | c9f1ef91146253f72987cb1436866523880965e0 /components/script_layout_interface | |
| parent | b1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff) | |
| download | servo-2012be4a8bd97f2fd69f986c8fffb1af1eec21dc.tar.gz servo-2012be4a8bd97f2fd69f986c8fffb1af1eec21dc.zip | |
`cargo fix --edition-idioms`
Diffstat (limited to 'components/script_layout_interface')
| -rw-r--r-- | components/script_layout_interface/lib.rs | 23 | ||||
| -rw-r--r-- | components/script_layout_interface/message.rs | 6 |
2 files changed, 4 insertions, 25 deletions
diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index 58695a27750..23de1c5b0f5 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -9,34 +9,12 @@ #![deny(unsafe_code)] #![feature(associated_type_defaults)] -extern crate app_units; -extern crate atomic_refcell; -extern crate canvas_traits; -extern crate cssparser; -extern crate euclid; -extern crate gfx_traits; #[macro_use] extern crate html5ever; -extern crate ipc_channel; -extern crate libc; #[macro_use] extern crate log; -extern crate malloc_size_of; #[macro_use] extern crate malloc_size_of_derive; -extern crate metrics; -extern crate msg; -extern crate net_traits; -extern crate profile_traits; -extern crate range; -extern crate script_traits; -extern crate selectors; -extern crate servo_arc; -extern crate servo_atoms; -extern crate servo_channel; -extern crate servo_url; -extern crate style; -extern crate webrender_api; pub mod message; pub mod reporter; @@ -53,6 +31,7 @@ use servo_url::ServoUrl; use std::ptr::NonNull; use std::sync::atomic::AtomicIsize; use style::data::ElementData; +use webrender_api; #[repr(C)] pub struct StyleData { diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index 01edca28a77..5c504d06e84 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -42,7 +42,7 @@ pub enum Msg { Reflow(ScriptReflow), /// Get an RPC interface. - GetRPC(Sender<Box<LayoutRPC + Send>>), + GetRPC(Sender<Box<dyn LayoutRPC + Send>>), /// Requests that the layout thread render the next frame of all animations. TickAnimations, @@ -94,7 +94,7 @@ pub enum Msg { UpdateScrollStateFromScript(ScrollState), /// Tells layout that script has added some paint worklet modules. - RegisterPaint(Atom, Vec<Atom>, Box<Painter>), + RegisterPaint(Atom, Vec<Atom>, Box<dyn Painter>), /// Send to layout the precise time when the navigation started. SetNavigationStart(u64), @@ -214,7 +214,7 @@ pub struct NewLayoutThreadInfo { pub pipeline_port: IpcReceiver<LayoutControlMsg>, pub constellation_chan: IpcSender<ConstellationMsg>, pub script_chan: IpcSender<ConstellationControlMsg>, - pub image_cache: Arc<ImageCache>, + pub image_cache: Arc<dyn ImageCache>, pub content_process_shutdown_chan: Option<IpcSender<()>>, pub layout_threads: usize, pub paint_time_metrics: PaintTimeMetrics, |