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

Merge pull request #2998 from Ms2ger/taskbuilder

Browse source 
Use TaskBuilder where possible; r=metajack
This commit is contained in:
Ms2ger 2014-08-04 18:49:40 +02:00
commit c1243e6aaa
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/main/servo.rs
View file

@ -45,19 +45,19 @@ use gfx::font_cache_task::FontCacheTask;
use servo_util::time::TimeProfiler; use servo_util::time::TimeProfiler;
#[cfg(not(test))] #[cfg(not(test))]
use servo_util::memory::MemoryProfiler; use servo_util::memory::MemoryProfiler;
#[cfg(not(test))] #[cfg(not(test))]
use servo_util::opts; use servo_util::opts;
#[cfg(not(test))] #[cfg(not(test))]
use url::{Url, UrlParser}; use green::GreenTaskBuilder;
#[cfg(not(test))] #[cfg(not(test))]
use std::os; use std::os;
#[cfg(not(test))]
use std::task::TaskBuilder;
#[cfg(not(test), target_os="android")] #[cfg(not(test), target_os="android")]
use std::str; use std::str;
#[cfg(not(test))] #[cfg(not(test))]
use rustrt::task::TaskOpts; use url::{Url, UrlParser};
#[cfg(not(test), target_os="linux")] #[cfg(not(test), target_os="linux")]
@ -111,7 +111,9 @@ pub fn run(opts: opts::Opts) {
let time_profiler_chan_clone = time_profiler_chan.clone(); let time_profiler_chan_clone = time_profiler_chan.clone();
let (result_chan, result_port) = channel(); let (result_chan, result_port) = channel();
pool.spawn(TaskOpts::new(), proc() { TaskBuilder::new()
.green(&mut pool)
.spawn(proc() {
let opts = &opts_clone; let opts = &opts_clone;
// Create a Servo instance. // Create a Servo instance.
let resource_task = new_resource_task(); let resource_task = new_resource_task();

13
src/components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -18,14 +18,13 @@ use script_task::{ScriptTask, ScriptChan};
use script_task::StackRootTLS; use script_task::StackRootTLS;
use servo_net::resource_task::{ResourceTask, load_whole_resource}; use servo_net::resource_task::{ResourceTask, load_whole_resource};
use servo_util::str::DOMString; use servo_util::str::DOMString;
use js::rust::Cx; use js::rust::Cx;
use std::rc::Rc; use std::rc::Rc;
use native; use std::task::TaskBuilder;
use rustrt::task::TaskOpts; use native::task::NativeTaskBuilder;
use url::Url; use url::Url;
#[deriving(Encodable)] #[deriving(Encodable)]
@ -66,10 +65,10 @@ impl DedicatedWorkerGlobalScope {
receiver: Receiver<DOMString>, receiver: Receiver<DOMString>,
resource_task: ResourceTask, resource_task: ResourceTask,
script_chan: ScriptChan) { script_chan: ScriptChan) {
let mut task_opts = TaskOpts::new(); TaskBuilder::new()
task_opts.name = Some(format!("Web Worker at {}", worker_url.serialize()) .native()
.into_maybe_owned()); .named(format!("Web Worker at {}", worker_url.serialize()))
native::task::spawn_opts(task_opts, proc() { .spawn(proc() {
let roots = RootCollection::new(); let roots = RootCollection::new();
let _stack_roots_tls = StackRootTLS::new(&roots); let _stack_roots_tls = StackRootTLS::new(&roots);