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

Take WorkerGlobalScope's worker_id out of its Option.

Browse source 
Unsurprisingly, every worker has an id, so there is no need to wrap it in an
Option.
This commit is contained in:
Ms2ger 2015-08-03 18:28:48 +02:00
parent 1809748dc1
commit bd04cecceb
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -119,7 +119,7 @@ impl DedicatedWorkerGlobalScope {
parent_sender: Box<ScriptChan+Send>,
own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>,
worker_id: Option<WorkerId>)
worker_id: WorkerId)
-> DedicatedWorkerGlobalScope {
DedicatedWorkerGlobalScope {
workerglobalscope: WorkerGlobalScope::new_inherited(
@ -146,7 +146,7 @@ impl DedicatedWorkerGlobalScope {
parent_sender: Box<ScriptChan+Send>,
own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>,
worker_id: Option<WorkerId>)
worker_id: WorkerId)
-> Root<DedicatedWorkerGlobalScope> {
let scope = box DedicatedWorkerGlobalScope::new_inherited(
worker_url, id, mem_profiler_chan, devtools_chan, devtools_sender, devtools_port,
@ -170,7 +170,7 @@ impl DedicatedWorkerGlobalScope {
parent_sender: Box<ScriptChan+Send>,
own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>,
worker_id: Option<WorkerId>) {
worker_id: WorkerId) {
let serialized_worker_url = worker_url.serialize();
spawn_named(format!("WebWorker for {}", serialized_worker_url), move || {
task_state::initialize(SCRIPT | IN_WORKER);