Clean up JSTraceable and how we use it

components/jstraceable_derive/lib.rs

@@ -41,10 +41,11 @@ fn expand_string(input: &str) -> String {
     }
 
     let tokens = quote! {
-        impl #impl_generics ::dom::bindings::trace::JSTraceable for #name #ty_generics #where_clause {
+        #[allow(unsafe_code)]
+        unsafe impl #impl_generics ::dom::bindings::trace::JSTraceable for #name #ty_generics #where_clause {
             #[inline]
             #[allow(unused_variables, unused_imports)]
-            fn trace(&self, tracer: *mut ::js::jsapi::JSTracer) {
+            unsafe fn trace(&self, tracer: *mut ::js::jsapi::JSTracer) {
                 use ::dom::bindings::trace::JSTraceable;
                 match *self {
                     #match_body

components/script/devtools.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use devtools_traits::{AutoMargins, CONSOLE_API, CachedConsoleMessage, CachedConsoleMessageTypes};
-use devtools_traits::{ComputedNodeLayout, ConsoleAPI, PageError, ScriptToDevtoolsControlMsg};
+use devtools_traits::{ComputedNodeLayout, ConsoleAPI, PageError};
 use devtools_traits::{EvaluateJSReply, Modification, NodeInfo, PAGE_ERROR, TimelineMarker};
 use devtools_traits::TimelineMarkerType;
 use dom::bindings::codegen::Bindings::CSSStyleDeclarationBinding::CSSStyleDeclarationMethods;
@@ -17,6 +17,7 @@ use dom::bindings::inheritance::Castable;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::Reflectable;
 use dom::bindings::str::DOMString;
+use dom::document::AnimationFrameCallback;
 use dom::element::Element;
 use dom::globalscope::GlobalScope;
 use dom::node::{Node, window_from_node};
@@ -253,11 +254,7 @@ pub fn handle_request_animation_frame(documents: &Documents,
                                       id: PipelineId,
                                       actor_name: String) {
     if let Some(doc) = documents.find_document(id) {
-        let devtools_sender = doc.window().upcast::<GlobalScope>().devtools_chan().unwrap().clone();
-        doc.request_animation_frame(box move |time| {
-            let msg = ScriptToDevtoolsControlMsg::FramerateTick(actor_name, time);
-            devtools_sender.send(msg).unwrap();
-        });
+        doc.request_animation_frame(AnimationFrameCallback::DevtoolsFramerateTick { actor_name });
     }
 }
 

components/script/docs/JS-Servos-only-GC.md

@@ -122,8 +122,8 @@ which has an area, and the trait provides a way to get that object's area.
 Now let's look at the `JSTraceable` trait, which we use for tracing:
 
 ```rust
-pub trait JSTraceable {
-    fn trace(&self, trc: *mut JSTracer);
+pub unsafe trait JSTraceable {
+    unsafe fn trace(&self, trc: *mut JSTracer);
 }
 ```
 
@@ -182,7 +182,7 @@ pub fn trace_reflector(tracer: *mut JSTracer, description: &str, reflector: &Ref
 }
 
 impl<T: Reflectable> JSTraceable for JS<T> {
-    fn trace(&self, trc: *mut JSTracer) {
+    unsafe fn trace(&self, trc: *mut JSTracer) {
         trace_reflector(trc, "", unsafe { (**self.ptr).reflector() });
     }
 }

components/script/dom/abstractworkerglobalscope.rs

@@ -5,6 +5,7 @@
 use dom::abstractworker::WorkerScriptMsg;
 use dom::bindings::refcounted::Trusted;
 use dom::bindings::reflector::Reflectable;
+use dom::bindings::trace::JSTraceable;
 use script_runtime::{ScriptChan, CommonScriptMsg, ScriptPort};
 use std::sync::mpsc::{Receiver, Sender};
 
@@ -17,7 +18,7 @@ pub struct SendableWorkerScriptChan<T: Reflectable> {
     pub worker: Trusted<T>,
 }
 
-impl<T: Reflectable + 'static> ScriptChan for SendableWorkerScriptChan<T> {
+impl<T: JSTraceable + Reflectable + 'static> ScriptChan for SendableWorkerScriptChan<T> {
     fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
         self.sender.send((self.worker.clone(), msg)).map_err(|_| ())
     }
@@ -39,7 +40,7 @@ pub struct WorkerThreadWorkerChan<T: Reflectable> {
     pub worker: Trusted<T>,
 }
 
-impl<T: Reflectable + 'static> ScriptChan for WorkerThreadWorkerChan<T> {
+impl<T: JSTraceable + Reflectable + 'static> ScriptChan for WorkerThreadWorkerChan<T> {
     fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
         self.sender
             .send((self.worker.clone(), WorkerScriptMsg::Common(msg)))

components/script/dom/bindings/js.rs

@@ -105,18 +105,18 @@ impl<T: Reflectable> Deref for JS<T> {
     }
 }
 
-impl<T: Reflectable> JSTraceable for JS<T> {
-    fn trace(&self, trc: *mut JSTracer) {
+unsafe impl<T: Reflectable> JSTraceable for JS<T> {
+    unsafe fn trace(&self, trc: *mut JSTracer) {
         #[cfg(debug_assertions)]
-        let trace_str = format!("for {} on heap", unsafe { type_name::<T>() });
+        let trace_str = format!("for {} on heap", type_name::<T>());
         #[cfg(debug_assertions)]
         let trace_info = &trace_str[..];
         #[cfg(not(debug_assertions))]
         let trace_info = "for DOM object on heap";
 
         trace_reflector(trc,
                         trace_info,
-                        unsafe { (**self.ptr).reflector() });
+                        (**self.ptr).reflector());
     }
 }