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

Remove the parent_sender_for_reporter local from DedicatedWorkerGlobalScope::run_worker_scope.

Browse source
This commit is contained in:
Ms2ger 2015-08-04 10:53:18 +02:00
parent bc97b421d2
commit 11ea299105
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -177,14 +177,13 @@ impl DedicatedWorkerGlobalScope {
let runtime = Rc::new(ScriptTask::new_rt_and_cx()); let runtime = Rc::new(ScriptTask::new_rt_and_cx());
let serialized_url = url.serialize(); let serialized_url = url.serialize();
let parent_sender_for_reporter = parent_sender.clone();
let (devtools_mpsc_chan, devtools_mpsc_port) = channel(); let (devtools_mpsc_chan, devtools_mpsc_port) = channel();
ROUTER.route_ipc_receiver_to_mpsc_sender(devtools_ipc_port, devtools_mpsc_chan); ROUTER.route_ipc_receiver_to_mpsc_sender(devtools_ipc_port, devtools_mpsc_chan);
let global = DedicatedWorkerGlobalScope::new( let global = DedicatedWorkerGlobalScope::new(
init, url, id, devtools_mpsc_port, runtime.clone(), init, url, id, devtools_mpsc_port, runtime.clone(),
parent_sender, own_sender, receiver); parent_sender.clone(), own_sender, receiver);
// FIXME(njn): workers currently don't have a unique ID suitable for using in reporter // FIXME(njn): workers currently don't have a unique ID suitable for using in reporter
// registration (#6631), so we instead use a random number and cross our fingers. // registration (#6631), so we instead use a random number and cross our fingers.
let scope = WorkerGlobalScopeCast::from_ref(global.r()); let scope = WorkerGlobalScopeCast::from_ref(global.r());
@ -211,7 +210,7 @@ impl DedicatedWorkerGlobalScope {
ROUTER.add_route(reporter_receiver.to_opaque(), box move |reporter_request| { ROUTER.add_route(reporter_receiver.to_opaque(), box move |reporter_request| {
// Just injects an appropriate event into the worker task's queue. // Just injects an appropriate event into the worker task's queue.
let reporter_request: ReporterRequest = reporter_request.to().unwrap(); let reporter_request: ReporterRequest = reporter_request.to().unwrap();
parent_sender_for_reporter.send(ScriptMsg::CollectReports( parent_sender.send(ScriptMsg::CollectReports(
reporter_request.reports_channel)).unwrap() reporter_request.reports_channel)).unwrap()
}); });
scope.mem_profiler_chan().send(mem::ProfilerMsg::RegisterReporter( scope.mem_profiler_chan().send(mem::ProfilerMsg::RegisterReporter(