make dom_struct derive HeapSizeOf,

closes #7357
servo · bors-servo · Aug 27, 2015 · Aug 25, 2015 · Aug 27, 2015 · fd87c8cb3ee5ac2be258e0420420c228299c90e3
commit fd87c8cb3ee5ac2be258e0420420c228299c90e3
diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs
@@ -17,6 +17,7 @@ pub fn expand_dom_struct(cx: &mut ExtCtxt, sp: Span, _: &MetaItem, anno: Annotat
         item2.attrs.push(quote_attr!(cx, #[must_root]));
         item2.attrs.push(quote_attr!(cx, #[privatize]));
         item2.attrs.push(quote_attr!(cx, #[derive(JSTraceable)]));
+        item2.attrs.push(quote_attr!(cx, #[derive(HeapSizeOf)]));
 
         // The following attributes are only for internal usage
         item2.attrs.push(quote_attr!(cx, #[_generate_reflector]));

diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
@@ -111,7 +111,6 @@ impl Deref for AttrValue {
 
 // https://dom.spec.whatwg.org/#interface-attr
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Attr {
     reflector_: Reflector,
     local_name: Atom,

diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
@@ -207,6 +207,7 @@ impl MutHeapJSVal {
 /// `JS<T>`.
 #[must_root]
 #[derive(JSTraceable)]
+#[derive(HeapSizeOf)]
 pub struct MutHeap<T: HeapGCValue + Copy> {
     val: Cell<T>,
 }

diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs
@@ -25,7 +25,6 @@ pub enum BlobTypeId {
 
 // http://dev.w3.org/2006/webapi/FileAPI/#blob
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Blob {
     reflector_: Reflector,
     type_: BlobTypeId,

diff --git a/components/script/dom/canvasgradient.rs b/components/script/dom/canvasgradient.rs
@@ -16,7 +16,6 @@ use dom::canvasrenderingcontext2d::parse_color;
 
 // https://html.spec.whatwg.org/multipage/#canvasgradient
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CanvasGradient {
     reflector_: Reflector,
     style: CanvasGradientStyle,

diff --git a/components/script/dom/canvaspattern.rs b/components/script/dom/canvaspattern.rs
@@ -12,7 +12,6 @@ use euclid::size::Size2D;
 
 // https://html.spec.whatwg.org/multipage/#canvaspattern
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CanvasPattern {
     reflector_: Reflector,
     surface_data: Vec<u8>,

diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
@@ -61,7 +61,6 @@ pub enum CanvasFillOrStrokeStyle {
 
 // https://html.spec.whatwg.org/multipage/#canvasrenderingcontext2d
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CanvasRenderingContext2D {
     reflector_: Reflector,
     global: GlobalField,

diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
@@ -24,7 +24,6 @@ use std::cell::Ref;
 
 // https://dom.spec.whatwg.org/#characterdata
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CharacterData {
     node: Node,
     data: DOMRefCell<DOMString>,

diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs
@@ -16,7 +16,6 @@ use script_task::ScriptChan;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CloseEvent {
     event: Event,
     wasClean: bool,

diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs
@@ -16,7 +16,6 @@ use util::str::DOMString;
 
 /// An HTML comment.
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Comment {
     characterdata: CharacterData,
 }
@@ -44,4 +43,3 @@ impl Comment {
         Ok(Comment::new(data, document.r()))
     }
 }
-
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
@@ -13,7 +13,6 @@ use util::str::DOMString;
 
 // https://developer.mozilla.org/en-US/docs/Web/API/Console
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Console {
     reflector_: Reflector,
     global: GlobalField,

diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs
@@ -22,7 +22,6 @@ no_jsmanaged_fields!(OsRng);
 
 // https://developer.mozilla.org/en-US/docs/Web/API/Crypto
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Crypto {
     reflector_: Reflector,
     rng: DOMRefCell<OsRng>,

diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs
@@ -10,7 +10,6 @@ use util::str::DOMString;
 use cssparser::serialize_identifier;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CSS {
     reflector_: Reflector,
 }

diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs
@@ -24,7 +24,6 @@ use std::cell::Ref;
 
 // http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CSSStyleDeclaration {
     reflector_: Reflector,
     owner: JS<Element>,

diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs
@@ -17,7 +17,6 @@ use util::str::DOMString;
 
 // https://dom.spec.whatwg.org/#interface-customevent
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct CustomEvent {
     event: Event,
     #[ignore_heap_size_of = "Defined in rust-mozjs"]
@@ -85,4 +84,3 @@ impl<'a> CustomEventMethods for &'a CustomEvent {
         event.InitEvent(type_, can_bubble, cancelable);
     }
 }
-
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -138,7 +138,6 @@ enum MixedMessage {
 
 // https://html.spec.whatwg.org/multipage/#dedicatedworkerglobalscope
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DedicatedWorkerGlobalScope {
     workerglobalscope: WorkerGlobalScope,
     id: PipelineId,

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
@@ -113,7 +113,6 @@ pub enum IsHTMLDocument {
 
 // https://dom.spec.whatwg.org/#document
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Document {
     node: Node,
     window: JS<Window>,

diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs
@@ -21,7 +21,6 @@ use util::str::DOMString;
 
 // https://dom.spec.whatwg.org/#documentfragment
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DocumentFragment {
     node: Node,
 }
@@ -96,4 +95,3 @@ impl<'a> DocumentFragmentMethods for &'a DocumentFragment {
         root.query_selector_all(selectors)
     }
 }
-
diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs
@@ -18,7 +18,6 @@ use std::borrow::ToOwned;
 // https://dom.spec.whatwg.org/#documenttype
 /// The `DOCTYPE` tag.
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DocumentType {
     node: Node,
     name: DOMString,
@@ -111,4 +110,3 @@ impl<'a> DocumentTypeMethods for &'a DocumentType {
         node.remove_self();
     }
 }
-
diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs
@@ -41,7 +41,6 @@ pub enum DOMErrorName {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMException {
     reflector_: Reflector,
     code: DOMErrorName,

diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs
@@ -27,7 +27,6 @@ use std::borrow::ToOwned;
 
 // https://dom.spec.whatwg.org/#domimplementation
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMImplementation {
     reflector_: Reflector,
     document: JS<Document>,

diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs
@@ -21,7 +21,6 @@ use util::str::DOMString;
 use std::borrow::ToOwned;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMParser {
     reflector_: Reflector,
     window: JS<Window>, //XXXjdm Document instead?
@@ -81,4 +80,3 @@ impl<'a> DOMParserMethods for &'a DOMParser {
         }
     }
 }
-
diff --git a/components/script/dom/dompoint.rs b/components/script/dom/dompoint.rs
@@ -12,7 +12,6 @@ use dom::dompointreadonly::{DOMPointReadOnly, DOMPointWriteMethods};
 
 // http://dev.w3.org/fxtf/geometry/Overview.html#dompoint
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMPoint {
     point: DOMPointReadOnly
 }
@@ -75,4 +74,3 @@ impl<'a> DOMPointMethods for &'a DOMPoint {
         self.point.SetW(value);
     }
 }
-
diff --git a/components/script/dom/dompointreadonly.rs b/components/script/dom/dompointreadonly.rs
@@ -11,7 +11,6 @@ use std::cell::Cell;
 
 // http://dev.w3.org/fxtf/geometry/Overview.html#dompointreadonly
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMPointReadOnly {
     reflector_: Reflector,
     x: Cell<f64>,

diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs
@@ -12,7 +12,6 @@ use dom::window::Window;
 use util::geometry::Au;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMRect {
     reflector_: Reflector,
     top: f32,
@@ -74,4 +73,3 @@ impl<'a> DOMRectMethods for &'a DOMRect {
         Finite::wrap(result)
     }
 }
-
diff --git a/components/script/dom/domrectlist.rs b/components/script/dom/domrectlist.rs
@@ -11,7 +11,6 @@ use dom::domrect::DOMRect;
 use dom::window::Window;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMRectList {
     reflector_: Reflector,
     rects: Vec<JS<DOMRect>>,
@@ -55,4 +54,3 @@ impl<'a> DOMRectListMethods for &'a DOMRectList {
         self.Item(index)
     }
 }
-
diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs
@@ -13,7 +13,6 @@ use dom::node::window_from_node;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMStringMap {
     reflector_: Reflector,
     element: JS<HTMLElement>,

diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs
@@ -19,7 +19,6 @@ use util::str::{DOMString, HTML_SPACE_CHARACTERS, str_join};
 use std::borrow::ToOwned;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMTokenList {
     reflector_: Reflector,
     element: JS<Element>,

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
@@ -92,7 +92,6 @@ use std::mem;
 use std::sync::Arc;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Element {
     node: Node,
     local_name: Atom,

diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs
@@ -22,7 +22,6 @@ use std::borrow::ToOwned;
 use std::cell::Cell;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct ErrorEvent {
     event: Event,
     message: DOMRefCell<DOMString>,

diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs
@@ -54,7 +54,6 @@ pub enum EventCancelable {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Event {
     reflector_: Reflector,
     type_id: EventTypeId,

diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
@@ -130,7 +130,6 @@ pub struct EventListenerEntry {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct EventTarget {
     reflector_: Reflector,
     type_id: EventTargetTypeId,

diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs
@@ -11,7 +11,6 @@ use dom::blob::{Blob, BlobTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct File {
     blob: Blob,
     name: DOMString,
@@ -46,4 +45,3 @@ impl<'a> FileMethods for &'a File {
         self.name.clone()
     }
 }
-
diff --git a/components/script/dom/filelist.rs b/components/script/dom/filelist.rs
@@ -12,7 +12,6 @@ use dom::window::Window;
 
 // https://w3c.github.io/FileAPI/#dfn-filelist
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct FileList {
     reflector_: Reflector,
     list: Vec<JS<File>>
@@ -49,4 +48,3 @@ impl<'a> FileListMethods for &'a FileList {
         item
     }
 }
-
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs
@@ -67,7 +67,6 @@ pub enum FileReaderReadyState {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct FileReader {
     eventtarget: EventTarget,
     global: GlobalField,

diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs
@@ -30,7 +30,6 @@ pub enum FormDatum {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct FormData {
     reflector_: Reflector,
     data: DOMRefCell<HashMap<DOMString, Vec<FormDatum>>>,

diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
@@ -33,7 +33,6 @@ use url::UrlParser;
 use std::default::Default;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLAnchorElement {
     htmlelement: HTMLElement,
     rel_list: MutNullableHeap<JS<DOMTokenList>>,

diff --git a/components/script/dom/htmlappletelement.rs b/components/script/dom/htmlappletelement.rs
@@ -20,7 +20,6 @@ use string_cache::Atom;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLAppletElement {
     htmlelement: HTMLElement
 }

diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs
@@ -22,7 +22,6 @@ use string_cache::Atom;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLAreaElement {
     htmlelement: HTMLElement,
     rel_list: MutNullableHeap<JS<DOMTokenList>>,

diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs
@@ -14,7 +14,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLAudioElement {
     htmlmediaelement: HTMLMediaElement
 }
@@ -46,4 +45,3 @@ impl HTMLAudioElement {
         Node::reflect_node(box element, document, HTMLAudioElementBinding::Wrap)
     }
 }
-
diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs
@@ -19,7 +19,6 @@ use util::str::DOMString;
 use url::{Url, UrlParser};
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLBaseElement {
     htmlelement: HTMLElement
 }

diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
@@ -35,7 +35,6 @@ use time;
 const INITIAL_REFLOW_DELAY: u64 = 200_000_000;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLBodyElement {
     htmlelement: HTMLElement,
     background_color: Cell<Option<RGBA>>,
@@ -183,4 +182,3 @@ impl VirtualMethods for HTMLBodyElement {
         }
     }
 }
-