Pass WorkerGlobalScopeInit to DedicatedWorkerGlobalScope::run_worker_scope.

This commit is contained in:
Ms2ger 2015-08-03 19:46:15 +02:00
parent 0da0fcbe9b
commit 6b61564f6d
2 changed files with 21 additions and 28 deletions

View file

@ -20,6 +20,7 @@ use dom::errorevent::ErrorEvent;
use dom::event::{Event, EventBubbles, EventCancelable, EventHelpers};
use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId};
use dom::messageevent::MessageEvent;
use dom::workerglobalscope::WorkerGlobalScopeInit;
use script_task::{ScriptChan, ScriptMsg, Runnable};
use devtools_traits::{DevtoolsPageInfo, ScriptToDevtoolsControlMsg};
@ -95,10 +96,17 @@ impl Worker {
None => None,
};
let init = WorkerGlobalScopeInit {
resource_task: resource_task,
mem_profiler_chan: global.mem_profiler_chan(),
devtools_chan: global.devtools_chan(),
devtools_sender: optional_sender,
constellation_chan: constellation_chan,
worker_id: worker_id,
};
DedicatedWorkerGlobalScope::run_worker_scope(
worker_url, global.pipeline(), global.mem_profiler_chan(), global.devtools_chan(),
optional_sender, devtools_receiver, worker_ref, resource_task,
constellation_chan, global.script_chan(), sender, receiver, worker_id);
init, worker_url, global.pipeline(), devtools_receiver, worker_ref,
global.script_chan(), sender, receiver);
Ok(worker)
}