Auto merge of #13572 - nox:cleanup-global, r=jdm

Clean up some global things

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13572)
<!-- Reviewable:end -->

5 files changed, 8 insertions, 19 deletions

diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index 5d679cce2e9..e0341ceeb68 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -125,12 +125,7 @@ impl<'a> GlobalRef<'a> {
     /// Get the `ResourceThreads` for this global scope.
     pub fn resource_threads(&self) -> ResourceThreads {
         match *self {
-            GlobalRef::Window(ref window) => {
-                let doc = window.Document();
-                let doc = doc.r();
-                let loader = doc.loader();
-                loader.resource_threads().clone()
-            }
+            GlobalRef::Window(ref window) => window.resource_threads().clone(),
             GlobalRef::Worker(ref worker) => worker.resource_threads().clone(),
         }
     }
@@ -140,14 +135,6 @@ impl<'a> GlobalRef<'a> {
         self.resource_threads().sender()
     }
 
-    /// Get the worker's id.
-    pub fn get_worker_id(&self) -> Option<WorkerId> {
-        match *self {
-            GlobalRef::Window(_) => None,
-            GlobalRef::Worker(ref worker) => Some(worker.get_worker_id()),
-        }
-    }
-
     /// Get next worker id.
     pub fn get_next_worker_id(&self) -> WorkerId {
         match *self {
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index 05bd5e558b8..ad28c585248 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -17,10 +17,15 @@ impl Console {
     fn send_to_devtools(global: GlobalRef, level: LogLevel, message: DOMString) {
         if let Some(chan) = global.devtools_chan() {
             let console_message = prepare_message(level, message);
+            let worker_id = if let GlobalRef::Worker(worker) = global {
+                Some(worker.get_worker_id())
+            } else {
+                None
+            };
             let devtools_message = ScriptToDevtoolsControlMsg::ConsoleAPI(
                 global.pipeline_id(),
                 console_message,
-                global.get_worker_id());
+                worker_id);
             chan.send(devtools_message).unwrap();
         }
     }
diff --git a/components/script/dom/serviceworkerregistration.rs b/components/script/dom/serviceworkerregistration.rs
index 6daec5d9647..f7c47b8ecec 100644
--- a/components/script/dom/serviceworkerregistration.rs
+++ b/components/script/dom/serviceworkerregistration.rs
@@ -60,7 +60,6 @@ impl ServiceWorkerRegistration {
         let init = prepare_workerscope_init(global, None);
         ScopeThings {
             script_url: script_url,
-            pipeline_id: global.pipeline_id(),
             init: init,
             worker_load_origin: worker_load_origin,
             devtools_chan: global.devtools_chan(),
diff --git a/components/script/serviceworker_manager.rs b/components/script/serviceworker_manager.rs
index 3ce26a7693e..3920b0cd62b 100644
--- a/components/script/serviceworker_manager.rs
+++ b/components/script/serviceworker_manager.rs
@@ -87,7 +87,7 @@ impl ServiceWorkerManager {
                     title: title,
                     url: scope_things.script_url.clone(),
                 };
-                let _ = chan.send(ScriptToDevtoolsControlMsg::NewGlobal((scope_things.pipeline_id,
+                let _ = chan.send(ScriptToDevtoolsControlMsg::NewGlobal((scope_things.init.pipeline_id,
                                                                          Some(scope_things.worker_id)),
                                                                          devtools_sender,
                                                                          page_info));
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index c3c777bb9f7..52f5fdd1188 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -151,8 +151,6 @@ pub enum ScriptMsg {
 pub struct ScopeThings {
     /// script resource url
     pub script_url: Url,
-    /// pipeline which requested the activation
-    pub pipeline_id: PipelineId,
     /// network load origin of the resource
     pub worker_load_origin: WorkerScriptLoadOrigin,
     /// base resources required to create worker global scopes