Introduce GlobalScope::core_resource_thread

5 files changed, 12 insertions, 14 deletions

diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index eac887b8a2f..ecca46a5a5e 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -22,7 +22,6 @@ use js::jsapi::{JSAutoCompartment, JSContext, JSObject};
 use js::jsapi::{JS_GetClass, MutableHandleValue};
 use js::rust::CompileOptionsWrapper;
 use libc;
-use net_traits::{CoreResourceThread, IpcSend};
 use profile_traits::time;
 use script_runtime::{CommonScriptMsg, EnqueuedPromiseCallback, ScriptChan};
 use script_runtime::{ScriptPort, maybe_take_panic_result};
@@ -68,11 +67,6 @@ impl<'a> GlobalRef<'a> {
         }
     }
 
-    /// Get the `CoreResourceThread` for this global scope
-    pub fn core_resource_thread(&self) -> CoreResourceThread {
-        self.as_global_scope().resource_threads().sender()
-    }
-
     /// `ScriptChan` used to send messages to the event loop of this global's
     /// thread.
     pub fn script_chan(&self) -> Box<ScriptChan + Send> {
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
index 08e5f84ab06..71405239122 100644
--- a/components/script/dom/globalscope.rs
+++ b/components/script/dom/globalscope.rs
@@ -21,7 +21,7 @@ use dom::workerglobalscope::WorkerGlobalScope;
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::{HandleValue, JS_GetContext, JS_GetObjectRuntime, JSContext};
 use msg::constellation_msg::PipelineId;
-use net_traits::ResourceThreads;
+use net_traits::{CoreResourceThread, ResourceThreads, IpcSend};
 use profile_traits::{mem, time};
 use script_traits::{ScriptMsg as ConstellationMsg, TimerEventRequest};
 use std::cell::Cell;
@@ -252,6 +252,11 @@ impl GlobalScope {
     pub fn resource_threads(&self) -> &ResourceThreads {
         &self.resource_threads
     }
+
+    /// Get the `CoreResourceThread` for this global scope.
+    pub fn core_resource_thread(&self) -> CoreResourceThread {
+        self.resource_threads().sender()
+    }
 }
 
 fn timestamp_in_ms(time: Timespec) -> u64 {
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 1b790d532d2..aa2a61b6c38 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -265,7 +265,7 @@ impl WebSocket {
             action_receiver: resource_action_receiver,
         };
 
-        let _ = global.core_resource_thread().send(WebsocketConnect(connect, connect_data));
+        let _ = global_scope.core_resource_thread().send(WebsocketConnect(connect, connect_data));
 
         *ws.sender.borrow_mut() = Some(dom_action_sender);
 
@@ -492,9 +492,8 @@ impl Runnable for ConnectionEstablishedTask {
         if let Some(cookies) = self.headers.get_raw("set-cookie") {
             for cookie in cookies.iter() {
                 if let Ok(cookie_value) = String::from_utf8(cookie.clone()) {
-                    let _ = ws.global().r().core_resource_thread().send(SetCookiesForUrl(ws.url.clone(),
-                                                                                         cookie_value,
-                                                                                         HTTP));
+                    let _ = ws.global_scope().core_resource_thread().send(
+                        SetCookiesForUrl(ws.url.clone(), cookie_value, HTTP));
                 }
             }
         }
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 87793f2d0b6..907f8ba2653 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -1303,7 +1303,7 @@ impl XMLHttpRequest {
             (global.networking_task_source(), None)
         };
 
-        let core_resource_thread = global.core_resource_thread();
+        let core_resource_thread = global.as_global_scope().core_resource_thread();
         XMLHttpRequest::initiate_async_xhr(context.clone(), script_chan,
                                            core_resource_thread, init);
 
diff --git a/components/script/fetch.rs b/components/script/fetch.rs
index bc04a5ecd92..a50f781d0b0 100644
--- a/components/script/fetch.rs
+++ b/components/script/fetch.rs
@@ -67,10 +67,10 @@ fn request_init_from_request(request: NetTraitsRequest) -> NetTraitsRequestInit
 // https://fetch.spec.whatwg.org/#fetch-method
 #[allow(unrooted_must_root)]
 pub fn Fetch(global: GlobalRef, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
-    let core_resource_thread = global.core_resource_thread();
+    let global_scope = global.as_global_scope();
+    let core_resource_thread = global_scope.core_resource_thread();
 
     // Step 1
-    let global_scope = global.as_global_scope();
     let promise = Promise::new(global_scope);
     let response = Response::new(global_scope);