diff options
Diffstat (limited to 'components/servo/lib.rs')
| -rw-r--r-- | components/servo/lib.rs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 22ec02646ef..225d8f8a3b5 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -16,8 +16,7 @@ // // The `Browser` is fed events from a generic type that implements the // `WindowMethods` trait. -#![feature(libc, thread_local)] -#![cfg_attr(not(test), feature(path))] +#![feature(thread_local)] extern crate compositing; extern crate devtools; @@ -26,6 +25,7 @@ extern crate net; extern crate net_traits; extern crate msg; extern crate profile; +extern crate profile_traits; #[macro_use] extern crate util; extern crate script; @@ -52,8 +52,10 @@ use net::resource_task::new_resource_task; use net_traits::storage_task::StorageTask; use gfx::font_cache_task::FontCacheTask; -use profile::mem; -use profile::time; +use profile::mem as profile_mem; +use profile::time as profile_time; +use profile_traits::mem; +use profile_traits::time; use util::opts; use std::rc::Rc; @@ -92,8 +94,8 @@ impl Browser { // to deliver the message. let (compositor_proxy, compositor_receiver) = WindowMethods::create_compositor_channel(&window); - let time_profiler_chan = time::Profiler::create(opts.time_profiler_period); - let mem_profiler_chan = mem::Profiler::create(opts.mem_profiler_period); + let time_profiler_chan = profile_time::Profiler::create(opts.time_profiler_period); + let mem_profiler_chan = profile_mem::Profiler::create(opts.mem_profiler_period); let devtools_chan = opts.devtools_port.map(|port| { devtools::start_server(port) }); @@ -153,7 +155,7 @@ fn create_constellation(opts: opts::Opts, use std::env; // Create a Servo instance. - let resource_task = new_resource_task(opts.user_agent.clone()); + let resource_task = new_resource_task(opts.user_agent.clone(), devtools_chan.clone()); let image_cache_task = new_image_cache_task(resource_task.clone()); let font_cache_task = FontCacheTask::new(resource_task.clone()); |