1 files changed, 8 insertions, 23 deletions

diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index 346396fc300..685137918df 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -12,7 +12,6 @@ use dom::bindings::js::{JS, Root, MutNullableHeap};
 use dom::bindings::utils::Reflectable;
 use dom::console::Console;
 use dom::crypto::Crypto;
-use dom::dedicatedworkerglobalscope::DedicatedWorkerGlobalScopeHelpers;
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::window::{base64_atob, base64_btoa};
 use dom::workerlocation::WorkerLocation;
@@ -284,19 +283,9 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope {
     }
 }
 
-pub trait WorkerGlobalScopeHelpers {
-    fn execute_script(self, source: DOMString);
-    fn handle_fire_timer(self, timer_id: TimerId);
-    fn script_chan(self) -> Box<ScriptChan + Send>;
-    fn pipeline(self) -> PipelineId;
-    fn new_script_pair(self) -> (Box<ScriptChan + Send>, Box<ScriptPort + Send>);
-    fn process_event(self, msg: CommonScriptMsg);
-    fn get_cx(self) -> *mut JSContext;
-    fn set_devtools_wants_updates(self, value: bool);
-}
 
-impl<'a> WorkerGlobalScopeHelpers for &'a WorkerGlobalScope {
-    fn execute_script(self, source: DOMString) {
+impl WorkerGlobalScope {
+    pub fn execute_script(&self, source: DOMString) {
         match self.runtime.evaluate_script(
             self.reflector().get_jsobject(), source, self.worker_url.serialize(), 1) {
             Ok(_) => (),
@@ -310,7 +299,7 @@ impl<'a> WorkerGlobalScopeHelpers for &'a WorkerGlobalScope {
         }
     }
 
-    fn script_chan(self) -> Box<ScriptChan + Send> {
+    pub fn script_chan(&self) -> Box<ScriptChan + Send> {
         let dedicated =
             DedicatedWorkerGlobalScopeCast::to_ref(self);
         match dedicated {
@@ -319,7 +308,7 @@ impl<'a> WorkerGlobalScopeHelpers for &'a WorkerGlobalScope {
         }
     }
 
-    fn pipeline(self) -> PipelineId {
+    pub fn pipeline(&self) -> PipelineId {
         let dedicated =
             DedicatedWorkerGlobalScopeCast::to_ref(self);
         match dedicated {
@@ -328,7 +317,7 @@ impl<'a> WorkerGlobalScopeHelpers for &'a WorkerGlobalScope {
         }
     }
 
-    fn new_script_pair(self) -> (Box<ScriptChan + Send>, Box<ScriptPort + Send>) {
+    pub fn new_script_pair(&self) -> (Box<ScriptChan + Send>, Box<ScriptPort + Send>) {
         let dedicated =
             DedicatedWorkerGlobalScopeCast::to_ref(self);
         match dedicated {
@@ -337,7 +326,7 @@ impl<'a> WorkerGlobalScopeHelpers for &'a WorkerGlobalScope {
         }
     }
 
-    fn process_event(self, msg: CommonScriptMsg) {
+    pub fn process_event(&self, msg: CommonScriptMsg) {
         let dedicated =
             DedicatedWorkerGlobalScopeCast::to_ref(self);
         match dedicated {
@@ -346,15 +335,11 @@ impl<'a> WorkerGlobalScopeHelpers for &'a WorkerGlobalScope {
         }
     }
 
-    fn handle_fire_timer(self, timer_id: TimerId) {
+    pub fn handle_fire_timer(&self, timer_id: TimerId) {
         self.timers.fire_timer(timer_id, self);
     }
 
-    fn get_cx(self) -> *mut JSContext {
-        self.runtime.cx()
-    }
-
-    fn set_devtools_wants_updates(self, value: bool) {
+    pub fn set_devtools_wants_updates(&self, value: bool) {
         self.devtools_wants_updates.set(value);
     }
 }