5 files changed, 10 insertions, 5 deletions
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index 373c6c7cbe0..023254d55a5 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -9,6 +9,7 @@ use dom::bindings::conversions::ToJSValConvertible;
 use dom::bindings::global::GlobalRef;
 use dom::domexception::{DOMException, DOMErrorName};
 
+use util::mem::HeapSizeOf;
 use util::str::DOMString;
 
 use js::jsapi::{JSContext, JSObject, RootedValue};
@@ -24,7 +25,7 @@ use std::ptr;
 use std::mem;
 
 /// DOM exceptions that can be thrown by a native DOM method.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, HeapSizeOf)]
 pub enum Error {
     /// IndexSizeError DOMException
     IndexSize,
diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index 053059cec9f..6412a47cbb0 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -27,6 +27,8 @@ use js::jsapi::{GetGlobalForObjectCrossCompartment};
 use js::jsapi::{JSContext, JSObject, JS_GetClass, MutableHandleValue};
 use url::Url;
 
+use util::mem::HeapSizeOf;
+
 /// A freely-copyable reference to a rooted global object.
 #[derive(Copy, Clone)]
 pub enum GlobalRef<'a> {
@@ -47,7 +49,7 @@ pub enum GlobalRoot {
 
 /// A traced reference to a global object, for use in fields of traced Rust
 /// structures.
-#[derive(JSTraceable)]
+#[derive(JSTraceable, HeapSizeOf)]
 #[must_root]
 pub enum GlobalField {
     /// A field for a `Window` object.
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index 0fde5678ab2..c6199e5dff7 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -463,4 +463,3 @@ impl<T: Reflectable> Drop for Root<T> {
         unsafe { (*self.root_list).unroot(self); }
     }
 }
-
diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs
index 5ee26f86543..26a4b6149a9 100644
--- a/components/script/dom/bindings/str.rs
+++ b/components/script/dom/bindings/str.rs
@@ -11,8 +11,10 @@ use std::ops;
 use std::str;
 use std::str::FromStr;
 
+use util::mem::HeapSizeOf;
+
 /// Encapsulates the IDL `ByteString` type.
-#[derive(JSTraceable,Clone,Eq,PartialEq)]
+#[derive(JSTraceable, Clone, Eq, PartialEq, HeapSizeOf)]
 pub struct ByteString(Vec<u8>);
 
 impl ByteString {
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 29172c64198..7b9a7999706 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -64,6 +64,7 @@ use net_traits::image::base::Image;
 use profile_traits::mem::ProfilerChan;
 use util::str::{LengthOrPercentageOrAuto};
 use selectors::parser::PseudoElement;
+use std::boxed::FnBox;
 use std::cell::{Cell, UnsafeCell, RefCell};
 use std::collections::{HashMap, HashSet};
 use std::collections::hash_state::HashState;
@@ -313,7 +314,7 @@ impl JSTraceable for Box<ScriptChan+Send> {
     }
 }
 
-impl JSTraceable for Box<Fn(f64, )> {
+impl JSTraceable for Box<FnBox(f64, )> {
     #[inline]
     fn trace(&self, _trc: *mut JSTracer) {
         // Do nothing