Remove from Trusted::new an unnecessary argument

components/script/dom/bindings/refcounted.rs

@@ -26,7 +26,7 @@ use core::nonzero::NonZero;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflectable, Reflector};
 use dom::bindings::trace::trace_reflector;
-use js::jsapi::{JSContext, JSTracer};
+use js::jsapi::JSTracer;
 use libc;
 use script_task::{CommonScriptMsg, ScriptChan};
 use std::cell::RefCell;
@@ -72,7 +72,7 @@ impl<T: Reflectable> Trusted<T> {
     /// Create a new `Trusted<T>` instance from an existing DOM pointer. The DOM object will
     /// be prevented from being GCed for the duration of the resulting `Trusted<T>` object's
     /// lifetime.
-    pub fn new(_cx: *mut JSContext, ptr: &T, script_chan: Box<ScriptChan + Send>) -> Trusted<T> {
+    pub fn new(ptr: &T, script_chan: Box<ScriptChan + Send>) -> Trusted<T> {
         LIVE_REFERENCES.with(|ref r| {
             let r = r.borrow();
             let live_references = r.as_ref().unwrap();

components/script/dom/filereader.rs

@@ -361,7 +361,7 @@ impl FileReader {
 
         let load_data = ReadMetaData::new(String::from(type_), label.map(String::from), function);
 
-        let fr = Trusted::new(global.get_cx(), self, global.file_reading_task_source());
+        let fr = Trusted::new(self, global.file_reading_task_source());
         let gen_id = self.generation_id.get();
 
         let script_chan = global.file_reading_task_source();

components/script/dom/htmlimageelement.rs

@@ -106,7 +106,7 @@ impl HTMLImageElement {
                 let img_url = img_url.unwrap();
                 *self.url.borrow_mut() = Some(img_url.clone());
 
-                let trusted_node = Trusted::new(window.get_cx(), self, window.networking_task_source());
+                let trusted_node = Trusted::new(self, window.networking_task_source());
                 let (responder_sender, responder_receiver) = ipc::channel().unwrap();
                 let script_chan = window.networking_task_source();
                 let wrapper = window.get_runnable_wrapper();

components/script/dom/htmllinkelement.rs

@@ -198,7 +198,7 @@ impl HTMLLinkElement {
                 // TODO: #8085 - Don't load external stylesheets if the node's mq doesn't match.
                 let doc = window.Document();
                 let script_chan = window.networking_task_source();
-                let elem = Trusted::new(window.get_cx(), self, script_chan.clone());
+                let elem = Trusted::new(self, script_chan.clone());
 
                 let context = Arc::new(Mutex::new(StylesheetContext {
                     elem: elem,

components/script/dom/htmlscriptelement.rs

@@ -277,7 +277,7 @@ impl HTMLScriptElement {
                         // the origin of the script element's node document, and the default origin
                         // behaviour set to taint.
                         let script_chan = window.networking_task_source();
-                        let elem = Trusted::new(window.get_cx(), self, script_chan.clone());
+                        let elem = Trusted::new(self, script_chan.clone());
 
                         let context = Arc::new(Mutex::new(ScriptContext {
                             elem: elem,
@@ -456,7 +456,7 @@ impl HTMLScriptElement {
             self.dispatch_load_event();
         } else {
             let chan = window.dom_manipulation_task_source();
-            let handler = Trusted::new(window.get_cx(), self, chan.clone());
+            let handler = Trusted::new(self, chan.clone());
             let dispatcher = box EventDispatcher {
                 element: handler,
                 is_error: false,
@@ -469,7 +469,7 @@ impl HTMLScriptElement {
         let window = window_from_node(self);
         let window = window.r();
         let chan = window.dom_manipulation_task_source();
-        let handler = Trusted::new(window.get_cx(), self, chan.clone());
+        let handler = Trusted::new(self, chan.clone());
         let dispatcher = box EventDispatcher {
             element: handler,
             is_error: true,

components/script/dom/htmltextareaelement.rs

@@ -344,7 +344,7 @@ impl VirtualMethods for HTMLTextAreaElement {
                             let window = window_from_node(self);
                             let window = window.r();
                             let chan = window.user_interaction_task_source();
-                            let handler = Trusted::new(window.get_cx(), self, chan.clone());
+                            let handler = Trusted::new(self, chan.clone());
                             let dispatcher = ChangeEventRunnable {
                                 element: handler,
                             };

components/script/dom/servohtmlparser.rs

@@ -249,13 +249,13 @@ impl AsyncResponseListener for ParserContext {
         };
 
         let parser = parser.r();
-        let win = parser.window();
         self.parser = Some(match parser {
             ParserRef::HTML(parser) => TrustedParser::HTML(
-                                        Trusted::new(win.get_cx(),
+                                        Trusted::new(parser,
-                                        parser,
+                                                     self.script_chan.clone())),
-                                        self.script_chan.clone())),
+            ParserRef::XML(parser) => TrustedParser::XML(
-            ParserRef::XML(parser) => TrustedParser::XML(Trusted::new(win.get_cx(), parser, self.script_chan.clone())),
+                                        Trusted::new(parser,
+                                                     self.script_chan.clone())),
         });
 
         match content_type {

components/script/dom/storage.rs

@@ -156,8 +156,7 @@ impl Storage {
         let global_ref = global_root.r();
         let main_script_chan = global_ref.as_window().main_thread_script_chan();
         let script_chan = global_ref.dom_manipulation_task_source();
-        let trusted_storage = Trusted::new(global_ref.get_cx(), self,
+        let trusted_storage = Trusted::new(self, script_chan);
-                                           script_chan.clone());
         main_script_chan.send(MainThreadScriptMsg::MainThreadRunnableMsg(
             box StorageEventRunnable::new(trusted_storage, key, old_value, new_value))).unwrap();
     }

components/script/dom/websocket.rs

@@ -217,7 +217,7 @@ impl WebSocket {
 
         // Step 7.
         let ws = WebSocket::new(global, resource_url.clone());
-        let address = Trusted::new(global.get_cx(), ws.r(), global.networking_task_source());
+        let address = Trusted::new(ws.r(), global.networking_task_source());
 
         let origin = global.get_url().serialize();
 
@@ -288,7 +288,7 @@ impl WebSocket {
 
         let global = self.global.root();
         let chan = global.r().networking_task_source();
-        let address = Trusted::new(global.r().get_cx(), self, chan.clone());
+        let address = Trusted::new(self, chan.clone());
 
         let new_buffer_amount = (self.buffered_amount.get() as u64) + data_byte_len;
         if new_buffer_amount > (u32::max_value() as u64) {

components/script/dom/worker.rs

@@ -75,7 +75,7 @@ impl Worker {
 
         let (sender, receiver) = channel();
         let worker = Worker::new(global, sender.clone());
-        let worker_ref = Trusted::new(global.get_cx(), worker.r(), global.dom_manipulation_task_source());
+        let worker_ref = Trusted::new(worker.r(), global.dom_manipulation_task_source());
         let worker_id = global.get_next_worker_id();
 
         let (devtools_sender, devtools_receiver) = ipc::channel().unwrap();
@@ -150,7 +150,7 @@ impl WorkerMethods for Worker {
     // https://html.spec.whatwg.org/multipage/#dom-dedicatedworkerglobalscope-postmessage
     fn PostMessage(&self, cx: *mut JSContext, message: HandleValue) -> ErrorResult {
         let data = try!(StructuredCloneData::write(cx, message));
-        let address = Trusted::new(cx, self, self.global.root().r().dom_manipulation_task_source().clone());
+        let address = Trusted::new(self, self.global.root().r().dom_manipulation_task_source());
         self.sender.send((address, WorkerScriptMsg::DOMMessage(data))).unwrap();
         Ok(())
     }

components/script/dom/xmlhttprequest.rs

@@ -1023,7 +1023,7 @@ impl XMLHttpRequest {
         // This will cancel all previous timeouts
         let global = self.global.root();
         let callback = ScheduledXHRTimeout {
-            xhr: Trusted::new(global.r().get_cx(), self, global.r().networking_task_source()),
+            xhr: Trusted::new(self, global.r().networking_task_source()),
             generation_id: self.generation_id.get(),
         };
         let duration = Length::new(duration_ms as u64);
@@ -1176,7 +1176,7 @@ impl XMLHttpRequest {
             Ok(req) => req,
         };
 
-        let xhr = Trusted::new(global.get_cx(), self, global.networking_task_source());
+        let xhr = Trusted::new(self, global.networking_task_source());
 
         let context = Arc::new(Mutex::new(XHRContext {
             xhr: xhr,

components/script/script_task.rs

@@ -1260,7 +1260,7 @@ impl ScriptTask {
         doc.mut_loader().inhibit_events();
 
         // https://html.spec.whatwg.org/multipage/#the-end step 7
-        let addr: Trusted<Document> = Trusted::new(self.get_cx(), doc, self.chan.clone());
+        let addr: Trusted<Document> = Trusted::new(doc, self.chan.clone());
         let handler = box DocumentProgressHandler::new(addr.clone());
         self.chan.send(CommonScriptMsg::RunnableMsg(ScriptTaskEventCategory::DocumentEvent, handler)).unwrap();