make dom_struct derive HeapSizeOf,

closes #7357

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]));

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,

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>,
 }

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,

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,

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>,

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,

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>,

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,

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()))
     }
 }
-

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,

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>,

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,
 }

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>,

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);
     }
 }
-

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,

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>,

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)
     }
 }
-

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();
     }
 }
-

components/script/dom/domexception.rs

@@ -41,7 +41,6 @@ pub enum DOMErrorName {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct DOMException {
     reflector_: Reflector,
     code: DOMErrorName,

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>,

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 {
         }
     }
 }
-

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);
     }
 }
-

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>,

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)
     }
 }
-

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)
     }
 }
-

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>,

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>,

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,

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>,

components/script/dom/event.rs

@@ -54,7 +54,6 @@ pub enum EventCancelable {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct Event {
     reflector_: Reflector,
     type_id: EventTypeId,

components/script/dom/eventtarget.rs

@@ -130,7 +130,6 @@ pub struct EventListenerEntry {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct EventTarget {
     reflector_: Reflector,
     type_id: EventTargetTypeId,

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()
     }
 }
-

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
     }
 }
-

components/script/dom/filereader.rs

@@ -67,7 +67,6 @@ pub enum FileReaderReadyState {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct FileReader {
     eventtarget: EventTarget,
     global: GlobalField,

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>>>,

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>>,

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
 }

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>>,

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)
     }
 }
-

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
 }

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 {
         }
     }
 }
-

components/script/dom/htmlbrelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLBRElement {
     htmlelement: HTMLElement,
 }
@@ -41,4 +40,3 @@ impl HTMLBRElement {
         Node::reflect_node(box element, document, HTMLBRElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlbuttonelement.rs

@@ -38,7 +38,6 @@ enum ButtonType {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLButtonElement {
     htmlelement: HTMLElement,
     button_type: Cell<ButtonType>
@@ -253,4 +252,3 @@ impl<'a> Activatable for &'a HTMLButtonElement {
         }
     }
 }
-

components/script/dom/htmlcanvaselement.rs

@@ -47,7 +47,6 @@ pub enum CanvasContext {
 impl HeapGCValue for CanvasContext {}
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLCanvasElement {
     htmlelement: HTMLElement,
     context: MutNullableHeap<CanvasContext>,
@@ -340,4 +339,3 @@ pub mod utils {
         result.image_response
     }
 }
-

components/script/dom/htmlcollection.rs

@@ -26,7 +26,6 @@ pub trait CollectionFilter : JSTraceable {
 pub struct Collection(JS<Node>, Box<CollectionFilter + 'static>);
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLCollection {
     reflector_: Reflector,
     #[ignore_heap_size_of = "Contains a trait object; can't measure due to #6870"]

components/script/dom/htmldataelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLDataElement {
     htmlelement: HTMLElement
 }
@@ -43,4 +42,3 @@ impl HTMLDataElement {
         Node::reflect_node(box element, document, HTMLDataElementBinding::Wrap)
     }
 }
-

components/script/dom/htmldatalistelement.rs

@@ -17,7 +17,6 @@ use dom::node::{Node, NodeTypeId, window_from_node};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLDataListElement {
     htmlelement: HTMLElement
 }
@@ -65,4 +64,3 @@ impl<'a> HTMLDataListElementMethods for &'a HTMLDataListElement {
         HTMLCollection::create(window.r(), node, filter)
     }
 }
-

components/script/dom/htmldialogelement.rs

@@ -18,7 +18,6 @@ use util::str::DOMString;
 use std::borrow::ToOwned;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLDialogElement {
     htmlelement: HTMLElement,
     return_value: DOMRefCell<DOMString>,

components/script/dom/htmldirectoryelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLDirectoryElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLDirectoryElement {
         Node::reflect_node(box element, document, HTMLDirectoryElementBinding::Wrap)
     }
 }
-

components/script/dom/htmldivelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLDivElement {
     htmlelement: HTMLElement
 }
@@ -43,4 +42,3 @@ impl HTMLDivElement {
         Node::reflect_node(box element, document, HTMLDivElementBinding::Wrap)
     }
 }
-

components/script/dom/htmldlistelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLDListElement {
     htmlelement: HTMLElement
 }
@@ -42,4 +41,3 @@ impl HTMLDListElement {
         Node::reflect_node(box element, document, HTMLDListElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlelement.rs

@@ -40,7 +40,6 @@ use std::intrinsics;
 use std::rc::Rc;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLElement {
     element: Element,
     style_decl: MutNullableHeap<JS<CSSStyleDeclaration>>,

components/script/dom/htmlembedelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLEmbedElement {
     htmlelement: HTMLElement
 }
@@ -41,4 +40,3 @@ impl HTMLEmbedElement {
         Node::reflect_node(box element, document, HTMLEmbedElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlfieldsetelement.rs

@@ -22,7 +22,6 @@ use dom::virtualmethods::VirtualMethods;
 use util::str::{DOMString, StaticStringVec};
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLFieldSetElement {
     htmlelement: HTMLElement
 }
@@ -171,4 +170,3 @@ impl VirtualMethods for HTMLFieldSetElement {
         }
     }
 }
-

components/script/dom/htmlfontelement.rs

@@ -19,7 +19,6 @@ use cssparser::RGBA;
 use std::cell::Cell;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLFontElement {
     htmlelement: HTMLElement,
     color: Cell<Option<RGBA>>,
@@ -95,4 +94,3 @@ impl HTMLFontElementHelpers for HTMLFontElement {
         self.color.get()
     }
 }
-

components/script/dom/htmlformelement.rs

@@ -43,7 +43,6 @@ use std::borrow::ToOwned;
 use std::cell::Cell;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLFormElement {
     htmlelement: HTMLElement,
     marked_for_reset: Cell<bool>,

components/script/dom/htmlframeelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLFrameElement {
     htmlelement: HTMLElement
 }
@@ -41,4 +40,3 @@ impl HTMLFrameElement {
         Node::reflect_node(box element, document, HTMLFrameElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlframesetelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLFrameSetElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLFrameSetElement {
         Node::reflect_node(box element, document, HTMLFrameSetElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlheadelement.rs

@@ -15,7 +15,6 @@ use dom::virtualmethods::VirtualMethods;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLHeadElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlheadingelement.rs

@@ -23,7 +23,6 @@ pub enum HeadingLevel {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLHeadingElement {
     htmlelement: HTMLElement,
     level: HeadingLevel,
@@ -58,4 +57,3 @@ impl HTMLHeadingElement {
         Node::reflect_node(box element, document, HTMLHeadingElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlhrelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLHRElement {
     htmlelement: HTMLElement,
 }
@@ -41,4 +40,3 @@ impl HTMLHRElement {
         Node::reflect_node(box element, document, HTMLHRElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlhtmlelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLHtmlElement {
     htmlelement: HTMLElement
 }
@@ -41,4 +40,3 @@ impl HTMLHtmlElement {
         Node::reflect_node(box element, document, HTMLHtmlElementBinding::Wrap)
     }
 }
-

components/script/dom/htmliframeelement.rs

@@ -55,7 +55,6 @@ enum SandboxAllowance {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLIFrameElement {
     htmlelement: HTMLElement,
     subpage_id: Cell<Option<SubpageId>>,

components/script/dom/htmlimageelement.rs

@@ -37,7 +37,6 @@ use std::borrow::ToOwned;
 use std::sync::Arc;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLImageElement {
     htmlelement: HTMLElement,
     url: DOMRefCell<Option<Url>>,

components/script/dom/htmlinputelement.rs

@@ -60,7 +60,6 @@ enum InputType {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLInputElement {
     htmlelement: HTMLElement,
     input_type: Cell<InputType>,

components/script/dom/htmllabelelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLLabelElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLLabelElement {
         Node::reflect_node(box element, document, HTMLLabelElementBinding::Wrap)
     }
 }
-

components/script/dom/htmllegendelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLLegendElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLLegendElement {
         Node::reflect_node(box element, document, HTMLLegendElementBinding::Wrap)
     }
 }
-

components/script/dom/htmllielement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLLIElement {
     htmlelement: HTMLElement,
 }
@@ -41,4 +40,3 @@ impl HTMLLIElement {
         Node::reflect_node(box element, document, HTMLLIElementBinding::Wrap)
     }
 }
-

components/script/dom/htmllinkelement.rs

@@ -39,7 +39,6 @@ use string_cache::Atom;
 use url::UrlParser;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLLinkElement {
     htmlelement: HTMLElement,
     rel_list: MutNullableHeap<JS<DOMTokenList>>,

components/script/dom/htmlmapelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLMapElement {
     htmlelement: HTMLElement
 }
@@ -43,4 +42,3 @@ impl HTMLMapElement {
         Node::reflect_node(box element, document, HTMLMapElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlmediaelement.rs

@@ -11,7 +11,6 @@ use dom::node::NodeTypeId;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLMediaElement {
     htmlelement: HTMLElement,
 }
@@ -54,4 +53,3 @@ impl PartialEq for HTMLMediaElementTypeId {
         (*self as u8) == (*other as u8)
     }
 }
-

components/script/dom/htmlmetaelement.rs

@@ -14,7 +14,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLMetaElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlmeterelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLMeterElement {
     htmlelement: HTMLElement
 }
@@ -43,4 +42,3 @@ impl HTMLMeterElement {
         Node::reflect_node(box element, document, HTMLMeterElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlmodelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLModElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLModElement {
         Node::reflect_node(box element, document, HTMLModElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlobjectelement.rs

@@ -25,7 +25,6 @@ use std::sync::Arc;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLObjectElement {
     htmlelement: HTMLElement,
     image: DOMRefCell<Option<Arc<Image>>>,
@@ -118,4 +117,3 @@ impl VirtualMethods for HTMLObjectElement {
         }
     }
 }
-

components/script/dom/htmlolistelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLOListElement {
     htmlelement: HTMLElement,
 }
@@ -43,4 +42,3 @@ impl HTMLOListElement {
         Node::reflect_node(box element, document, HTMLOListElementBinding::Wrap)
     }
 }
-

components/script/dom/htmloptgroupelement.rs

@@ -20,7 +20,6 @@ use dom::virtualmethods::VirtualMethods;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLOptGroupElement {
     htmlelement: HTMLElement
 }
@@ -107,4 +106,3 @@ impl VirtualMethods for HTMLOptGroupElement {
         }
     }
 }
-

components/script/dom/htmloptionelement.rs

@@ -23,7 +23,6 @@ use dom::virtualmethods::VirtualMethods;
 use util::str::{DOMString, split_html_space_chars};
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLOptionElement {
     htmlelement: HTMLElement
 }
@@ -187,4 +186,3 @@ impl VirtualMethods for HTMLOptionElement {
         }
     }
 }
-

components/script/dom/htmloutputelement.rs

@@ -15,7 +15,6 @@ use dom::validitystate::ValidityState;
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLOutputElement {
     htmlelement: HTMLElement
 }
@@ -54,4 +53,3 @@ impl<'a> HTMLOutputElementMethods for &'a HTMLOutputElement {
         ValidityState::new(window.r())
     }
 }
-

components/script/dom/htmlparagraphelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLParagraphElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLParagraphElement {
         Node::reflect_node(box element, document, HTMLParagraphElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlparamelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLParamElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLParamElement {
         Node::reflect_node(box element, document, HTMLParamElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlpreelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLPreElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLPreElement {
         Node::reflect_node(box element, document, HTMLPreElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlprogresselement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLProgressElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLProgressElement {
         Node::reflect_node(box element, document, HTMLProgressElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlquoteelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLQuoteElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLQuoteElement {
         Node::reflect_node(box element, document, HTMLQuoteElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlscriptelement.rs

@@ -52,7 +52,6 @@ use url::{Url, UrlParser};
 use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLScriptElement {
     htmlelement: HTMLElement,
 

components/script/dom/htmlselectelement.rs

@@ -25,7 +25,6 @@ use util::str::DOMString;
 use std::borrow::ToOwned;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLSelectElement {
     htmlelement: HTMLElement
 }
@@ -171,4 +170,3 @@ impl VirtualMethods for HTMLSelectElement {
         }
     }
 }
-

components/script/dom/htmlsourceelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLSourceElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLSourceElement {
         Node::reflect_node(box element, document, HTMLSourceElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlspanelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLSpanElement {
     htmlelement: HTMLElement
 }
@@ -41,4 +40,3 @@ impl HTMLSpanElement {
         Node::reflect_node(box element, document, HTMLSpanElementBinding::Wrap)
     }
 }
-

components/script/dom/htmlstyleelement.rs

@@ -22,7 +22,6 @@ use style::stylesheets::{Origin, Stylesheet};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLStyleElement {
     htmlelement: HTMLElement,
 }
@@ -108,4 +107,3 @@ impl VirtualMethods for HTMLStyleElement {
         }
     }
 }
-

components/script/dom/htmltablecaptionelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableCaptionElement {
     htmlelement: HTMLElement
 }
@@ -44,4 +43,3 @@ impl HTMLTableCaptionElement {
         Node::reflect_node(box element, document, HTMLTableCaptionElementBinding::Wrap)
     }
 }
-

components/script/dom/htmltablecellelement.rs

@@ -36,7 +36,6 @@ impl PartialEq for HTMLTableCellElementTypeId {
 }
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableCellElement {
     htmlelement: HTMLElement,
     background_color: Cell<Option<RGBA>>,
@@ -149,4 +148,3 @@ impl VirtualMethods for HTMLTableCellElement {
         }
     }
 }
-

components/script/dom/htmltablecolelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableColElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLTableColElement {
         Node::reflect_node(box element, document, HTMLTableColElementBinding::Wrap)
     }
 }
-

components/script/dom/htmltabledatacellelement.rs

@@ -14,7 +14,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableDataCellElement {
     htmltablecellelement: HTMLTableCellElement,
 }
@@ -49,4 +48,3 @@ impl HTMLTableDataCellElement {
                            HTMLTableDataCellElementBinding::Wrap)
     }
 }
-

components/script/dom/htmltableelement.rs

@@ -27,7 +27,6 @@ use string_cache::Atom;
 use std::cell::Cell;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableElement {
     htmlelement: HTMLElement,
     background_color: Cell<Option<RGBA>>,
@@ -207,4 +206,3 @@ impl VirtualMethods for HTMLTableElement {
         }
     }
 }
-

components/script/dom/htmltableheadercellelement.rs

@@ -14,7 +14,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableHeaderCellElement {
     htmltablecellelement: HTMLTableCellElement,
 }
@@ -46,4 +45,3 @@ impl HTMLTableHeaderCellElement {
         Node::reflect_node(box element, document, HTMLTableHeaderCellElementBinding::Wrap)
     }
 }
-

components/script/dom/htmltablerowelement.rs

@@ -18,7 +18,6 @@ use std::cell::Cell;
 use util::str::{self, DOMString};
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableRowElement {
     htmlelement: HTMLElement,
     background_color: Cell<Option<RGBA>>,

components/script/dom/htmltablesectionelement.rs

@@ -18,7 +18,6 @@ use std::cell::Cell;
 use util::str::{self, DOMString};
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTableSectionElement {
     htmlelement: HTMLElement,
     background_color: Cell<Option<RGBA>>,

components/script/dom/htmltemplateelement.rs

@@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId};
 use util::str::DOMString;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTemplateElement {
     htmlelement: HTMLElement,
 }
@@ -44,4 +43,3 @@ impl HTMLTemplateElement {
         Node::reflect_node(box element, document, HTMLTemplateElementBinding::Wrap)
     }
 }
-

components/script/dom/htmltextareaelement.rs

@@ -38,7 +38,6 @@ use std::borrow::ToOwned;
 use std::cell::Cell;
 
 #[dom_struct]
-#[derive(HeapSizeOf)]
 pub struct HTMLTextAreaElement {
     htmlelement: HTMLElement,
     #[ignore_heap_size_of = "#7193"]