Auto merge of #6926 - Ms2ger:dwgs-args, r=jdm

Implement a WorkerGlobalScopeInit struct to pass arguments to WorkerGlobalScope::new_inherited more easily.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6926)
<!-- Reviewable:end -->

components/script/dom/bindings/global.rs

@@ -125,7 +125,7 @@ impl<'a> GlobalRef<'a> {
     pub fn get_worker_id(&self) -> Option<WorkerId> {
         match *self {
             GlobalRef::Window(_) => None,
-            GlobalRef::Worker(ref worker) => worker.get_worker_id(),
+            GlobalRef::Worker(ref worker) => Some(worker.get_worker_id()),
         }
     }
 

components/script/dom/dedicatedworkerglobalscope.rs

@@ -21,21 +21,19 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId};
 use dom::messageevent::MessageEvent;
 use dom::worker::{TrustedWorkerAddress, WorkerMessageHandler, WorkerEventHandler, WorkerErrorHandler};
 use dom::workerglobalscope::{WorkerGlobalScope, WorkerGlobalScopeHelpers};
-use dom::workerglobalscope::WorkerGlobalScopeTypeId;
+use dom::workerglobalscope::{WorkerGlobalScopeTypeId, WorkerGlobalScopeInit};
 use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource, ScriptPort};
 use script_task::StackRootTLS;
 
-use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId};
+use devtools_traits::DevtoolScriptControlMsg;
-
+use msg::constellation_msg::PipelineId;
-use devtools_traits::{ScriptToDevtoolsControlMsg, DevtoolScriptControlMsg};
+use net_traits::load_whole_resource;
-
-use net_traits::{load_whole_resource, ResourceTask};
 use profile_traits::mem::{self, Reporter, ReporterRequest};
 use util::task::spawn_named;
 use util::task_state;
 use util::task_state::{SCRIPT, IN_WORKER};
 
-use ipc_channel::ipc::{self, IpcSender, IpcReceiver};
+use ipc_channel::ipc::{self, IpcReceiver};
 use ipc_channel::router::ROUTER;
 use js::jsapi::{JSContext, RootedValue, HandleValue};
 use js::jsapi::{JSAutoRequest, JSAutoCompartment};
@@ -107,25 +105,19 @@ pub struct DedicatedWorkerGlobalScope {
 }
 
 impl DedicatedWorkerGlobalScope {
-    fn new_inherited(worker_url: Url,
+    fn new_inherited(init: WorkerGlobalScopeInit,
+                     worker_url: Url,
                      id: PipelineId,
-                     mem_profiler_chan: mem::ProfilerChan,
-                     devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-                     devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
                      devtools_port: Receiver<DevtoolScriptControlMsg>,
                      runtime: Rc<Runtime>,
-                     resource_task: ResourceTask,
-                     constellation_chan: ConstellationChan,
                      parent_sender: Box<ScriptChan+Send>,
                      own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
-                     receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>,
+                     receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>)
-                     worker_id: Option<WorkerId>)
                      -> DedicatedWorkerGlobalScope {
         DedicatedWorkerGlobalScope {
             workerglobalscope: WorkerGlobalScope::new_inherited(
-                WorkerGlobalScopeTypeId::DedicatedGlobalScope, worker_url, runtime, resource_task,
+                WorkerGlobalScopeTypeId::DedicatedGlobalScope, init, worker_url,
-                mem_profiler_chan, devtools_chan, devtools_sender, devtools_port, constellation_chan,
+                runtime, devtools_port),
-                worker_id),
             id: id,
             receiver: receiver,
             own_sender: own_sender,
@@ -134,43 +126,32 @@ impl DedicatedWorkerGlobalScope {
         }
     }
 
-    pub fn new(worker_url: Url,
+    pub fn new(init: WorkerGlobalScopeInit,
+               worker_url: Url,
                id: PipelineId,
-               mem_profiler_chan: mem::ProfilerChan,
-               devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-               devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
                devtools_port: Receiver<DevtoolScriptControlMsg>,
                runtime: Rc<Runtime>,
-               resource_task: ResourceTask,
-               constellation_chan: ConstellationChan,
                parent_sender: Box<ScriptChan+Send>,
                own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
-               receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>,
+               receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>)
-               worker_id: Option<WorkerId>)
                -> Root<DedicatedWorkerGlobalScope> {
         let scope = box DedicatedWorkerGlobalScope::new_inherited(
-            worker_url, id, mem_profiler_chan, devtools_chan, devtools_sender, devtools_port,
+            init, worker_url, id, devtools_port, runtime.clone(), parent_sender,
-            runtime.clone(), resource_task, constellation_chan, parent_sender, own_sender, receiver,
+            own_sender, receiver);
-            worker_id);
         DedicatedWorkerGlobalScopeBinding::Wrap(runtime.cx(), scope)
     }
 }
 
 impl DedicatedWorkerGlobalScope {
     #[allow(unsafe_code)]
-    pub fn run_worker_scope(worker_url: Url,
+    pub fn run_worker_scope(init: WorkerGlobalScopeInit,
+                            worker_url: Url,
                             id: PipelineId,
-                            mem_profiler_chan: mem::ProfilerChan,
-                            devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-                            devtools_ipc_chan: Option<IpcSender<DevtoolScriptControlMsg>>,
                             devtools_ipc_port: IpcReceiver<DevtoolScriptControlMsg>,
                             worker: TrustedWorkerAddress,
-                            resource_task: ResourceTask,
-                            constellation_chan: ConstellationChan,
                             parent_sender: Box<ScriptChan+Send>,
                             own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>,
-                            receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>,
+                            receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>) {
-                            worker_id: Option<WorkerId>) {
         let serialized_worker_url = worker_url.serialize();
         spawn_named(format!("WebWorker for {}", serialized_worker_url), move || {
             task_state::initialize(SCRIPT | IN_WORKER);
@@ -178,7 +159,7 @@ impl DedicatedWorkerGlobalScope {
             let roots = RootCollection::new();
             let _stack_roots_tls = StackRootTLS::new(&roots);
 
-            let (url, source) = match load_whole_resource(&resource_task, worker_url) {
+            let (url, source) = match load_whole_resource(&init.resource_task, worker_url) {
                 Err(_) => {
                     println!("error loading script {}", serialized_worker_url);
                     parent_sender.send(ScriptMsg::RunnableMsg(
@@ -198,9 +179,8 @@ impl DedicatedWorkerGlobalScope {
             ROUTER.route_ipc_receiver_to_mpsc_sender(devtools_ipc_port, devtools_mpsc_chan);
 
             let global = DedicatedWorkerGlobalScope::new(
-                url, id, mem_profiler_chan.clone(), devtools_chan, devtools_ipc_chan, devtools_mpsc_port,
+                init, url, id, devtools_mpsc_port, runtime.clone(),
-                runtime.clone(), resource_task, constellation_chan, parent_sender, own_sender, receiver,
+                parent_sender, own_sender, receiver);
-                worker_id);
             // 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.
             let scope = WorkerGlobalScopeCast::from_ref(global.r());
@@ -230,7 +210,7 @@ impl DedicatedWorkerGlobalScope {
                     parent_sender_for_reporter.send(ScriptMsg::CollectReports(
                             reporter_request.reports_channel)).unwrap()
                 });
-                mem_profiler_chan.send(mem::ProfilerMsg::RegisterReporter(
+                scope.mem_profiler_chan().send(mem::ProfilerMsg::RegisterReporter(
                         reporter_name.clone(),
                         Reporter(reporter_sender)));
             }
@@ -292,7 +272,7 @@ impl DedicatedWorkerGlobalScope {
 
             // Unregister this task as a memory reporter.
             let msg = mem::ProfilerMsg::UnregisterReporter(reporter_name);
-            mem_profiler_chan.send(msg);
+            scope.mem_profiler_chan().send(msg);
         });
     }
 }

components/script/dom/worker.rs

@@ -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(),
+            init, worker_url, global.pipeline(), devtools_receiver, worker_ref,
-            optional_sender, devtools_receiver, worker_ref, resource_task,
+            global.script_chan(), sender, receiver);
-            constellation_chan, global.script_chan(), sender, receiver, Some(worker_id));
 
         Ok(worker)
     }

components/script/dom/workerglobalscope.rs

@@ -42,11 +42,20 @@ pub enum WorkerGlobalScopeTypeId {
     DedicatedGlobalScope,
 }
 
+pub struct WorkerGlobalScopeInit {
+    pub resource_task: ResourceTask,
+    pub mem_profiler_chan: mem::ProfilerChan,
+    pub devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
+    pub devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
+    pub constellation_chan: ConstellationChan,
+    pub worker_id: WorkerId,
+}
+
 // https://html.spec.whatwg.org/multipage/#the-workerglobalscope-common-interface
 #[dom_struct]
 pub struct WorkerGlobalScope {
     eventtarget: EventTarget,
-    worker_id: Option<WorkerId>,
+    worker_id: WorkerId,
     worker_url: Url,
     runtime: Rc<Runtime>,
     next_worker_id: Cell<WorkerId>,
@@ -76,34 +85,29 @@ pub struct WorkerGlobalScope {
 
 impl WorkerGlobalScope {
     pub fn new_inherited(type_id: WorkerGlobalScopeTypeId,
+                         init: WorkerGlobalScopeInit,
                          worker_url: Url,
                          runtime: Rc<Runtime>,
-                         resource_task: ResourceTask,
+                         devtools_receiver: Receiver<DevtoolScriptControlMsg>)
-                         mem_profiler_chan: mem::ProfilerChan,
-                         devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,
-                         devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
-                         devtools_receiver: Receiver<DevtoolScriptControlMsg>,
-                         constellation_chan: ConstellationChan,
-                         worker_id: Option<WorkerId>)
                          -> WorkerGlobalScope {
         WorkerGlobalScope {
             eventtarget: EventTarget::new_inherited(EventTargetTypeId::WorkerGlobalScope(type_id)),
             next_worker_id: Cell::new(WorkerId(0)),
-            worker_id: worker_id,
+            worker_id: init.worker_id,
             worker_url: worker_url,
             runtime: runtime,
-            resource_task: resource_task,
+            resource_task: init.resource_task,
             location: Default::default(),
             navigator: Default::default(),
             console: Default::default(),
             crypto: Default::default(),
             timers: TimerManager::new(),
-            mem_profiler_chan: mem_profiler_chan,
+            mem_profiler_chan: init.mem_profiler_chan,
-            devtools_chan: devtools_chan,
+            devtools_chan: init.devtools_chan,
-            devtools_sender: devtools_sender,
+            devtools_sender: init.devtools_sender,
             devtools_receiver: devtools_receiver,
             devtools_wants_updates: Cell::new(false),
-            constellation_chan: constellation_chan,
+            constellation_chan: init.constellation_chan,
         }
     }
 
@@ -144,7 +148,7 @@ impl WorkerGlobalScope {
         &self.worker_url
     }
 
-    pub fn get_worker_id(&self) -> Option<WorkerId> {
+    pub fn get_worker_id(&self) -> WorkerId {
         self.worker_id.clone()
     }