diff options
Diffstat (limited to 'components')
155 files changed, 3 insertions, 226 deletions
diff --git a/components/plugins/jstraceable.rs b/components/plugins/jstraceable.rs index 035c50d5e46..2dfd4305c9d 100644 --- 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 index 3df9265580e..fcc577b7cd5 100644 --- 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 index 5b05d3ea99f..21b0e229911 100644 --- 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 index 717d50663ea..f30eaa80a90 100644 --- 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 index ca91a7a7857..2753e75b23d 100644 --- 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 index 49dae9c419b..25293e526f0 100644 --- 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 index 03f4014ee7a..4b8a08833a2 100644 --- 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 index b2d3dfec0cb..1d6f8f87d74 100644 --- 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 index a9a6c8e960e..0d251642b3c 100644 --- 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 index 930d737a168..5f742ffb3b3 100644 --- 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 index fb0e2ab08f3..5b60c2deb40 100644 --- 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 index 8764dd900ff..63f56c9523a 100644 --- 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 index c88b3ea92fc..5f4bce94d28 100644 --- 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 index 5e2b82c186d..c72eaaed8ef 100644 --- 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 index a020b7ef5cd..17e8bfdd4a7 100644 --- 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 index 1521b0d5bba..5e724f95141 100644 --- 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 index 7e5adec0353..a3b8c56dd9f 100644 --- 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 index 6ffba9208f7..e5e1d81ef39 100644 --- 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 index 2a13acb2fe2..d835dfaccb3 100644 --- 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 index 7ac87ce61c4..6bf97a457fc 100644 --- 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 index 50999d71c0c..5cd21c2a780 100644 --- 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 index 48834425821..9b50973d91e 100644 --- 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 index 0da4d13d415..f4291a271e3 100644 --- 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 index 57bc2ae24b7..b0a3d33f5e1 100644 --- 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 index a3608d3d865..c2936217c94 100644 --- 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 index 640a07a49c7..2efeb9d1587 100644 --- 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 index 7d3683f74db..8bdff569174 100644 --- 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 index 8571ec6b482..182bdbe29ce 100644 --- 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 index 767ce388c75..d9a42fc37c7 100644 --- 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 index 9fa8807972b..3c465e472f1 100644 --- 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 index 77f7f7aa595..aa2f856bf30 100644 --- 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 index 30ea02cf485..c492919da82 100644 --- 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 index 563c60bc9b3..d94377489f5 100644 --- 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 index b6a650cee65..6da842ea076 100644 --- 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 index f23578a0535..b50752b8569 100644 --- 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 index cd26613cb74..35fafb8400c 100644 --- 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 index b21b4e39e81..ea564d341c9 100644 --- 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 index 1a21c7ae74e..1c108c0b9c0 100644 --- 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 index ef56e824489..6befbed6743 100644 --- 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 index 10872b6e83b..0bb158836d6 100644 --- 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 index 5759d2b852a..ed1c1b86cf7 100644 --- 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 index 7ebaf11c26c..03766c06ecc 100644 --- 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 { } } } - diff --git a/components/script/dom/htmlbrelement.rs b/components/script/dom/htmlbrelement.rs index 6330c15ddbb..a0a4b16d4d8 100644 --- a/components/script/dom/htmlbrelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 50da7ce5871..798e17ff918 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 49b7bc21023..35f030f8def 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/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 } } - diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index f31dc1894d3..142bc6d73ef 100644 --- a/components/script/dom/htmlcollection.rs +++ b/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"] diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs index 915f5d32b02..6e74d8fa9f9 100644 --- a/components/script/dom/htmldataelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index 17b1f019ee8..900ba423372 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/htmldialogelement.rs index e3003c25d0f..3750ad946d8 100644 --- a/components/script/dom/htmldialogelement.rs +++ b/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>, diff --git a/components/script/dom/htmldirectoryelement.rs b/components/script/dom/htmldirectoryelement.rs index 916868bf753..2b6a90d11a0 100644 --- a/components/script/dom/htmldirectoryelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/htmldivelement.rs index 2c2edd0b0d0..d5979f2c16b 100644 --- a/components/script/dom/htmldivelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmldlistelement.rs b/components/script/dom/htmldlistelement.rs index a582ebd75ce..d9b616dd15f 100644 --- a/components/script/dom/htmldlistelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 8c39da2b4da..01b222fd539 100644 --- a/components/script/dom/htmlelement.rs +++ b/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>>, diff --git a/components/script/dom/htmlembedelement.rs b/components/script/dom/htmlembedelement.rs index 9855702e2e5..bd741de54fa 100644 --- a/components/script/dom/htmlembedelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 2701e00ae4d..8c1957c31c1 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index fae23cff525..907acc97dcb 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/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() } } - diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 4e80a59abf2..b5ca5308c4d 100644 --- a/components/script/dom/htmlformelement.rs +++ b/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>, diff --git a/components/script/dom/htmlframeelement.rs b/components/script/dom/htmlframeelement.rs index 7d60ccc6352..30acbd99797 100644 --- a/components/script/dom/htmlframeelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/htmlframesetelement.rs index 5a42343f76f..d665efa13ff 100644 --- a/components/script/dom/htmlframesetelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs index ce35a0e7286..699821241f1 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/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 } diff --git a/components/script/dom/htmlheadingelement.rs b/components/script/dom/htmlheadingelement.rs index 3b01900688d..f3c8aed9746 100644 --- a/components/script/dom/htmlheadingelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs index ffbe53fadb2..0bd8a9a9ffa 100644 --- a/components/script/dom/htmlhrelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlhtmlelement.rs b/components/script/dom/htmlhtmlelement.rs index 4e5250063a7..94b4e58c696 100644 --- a/components/script/dom/htmlhtmlelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 174490b964d..401f8a368e4 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/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>>, diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 5ddc2f85482..f60817e8592 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/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>>, diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 9c29f967f99..5dd3c60e885 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -60,7 +60,6 @@ enum InputType { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLInputElement { htmlelement: HTMLElement, input_type: Cell<InputType>, diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index 479f85d9660..5e7da7dfbff 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs index 0b992092f6f..492615d4421 100644 --- a/components/script/dom/htmllegendelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmllielement.rs b/components/script/dom/htmllielement.rs index ca552e0b405..fd10a954787 100644 --- a/components/script/dom/htmllielement.rs +++ b/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) } } - diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index f5f1cfdc284..8dea8ecf5cb 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/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>>, diff --git a/components/script/dom/htmlmapelement.rs b/components/script/dom/htmlmapelement.rs index e79bd1db4c3..e060a7bf48e 100644 --- a/components/script/dom/htmlmapelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 227f298d96d..bef4dcd93e0 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 55561c81fc0..a66cfe3b7ee 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/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, } diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs index d91be36f600..8ea70b2ffdd 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlmodelement.rs b/components/script/dom/htmlmodelement.rs index eed06692bce..90f0ebe5103 100644 --- a/components/script/dom/htmlmodelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index 5cf3cb07229..4af221e7100 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmlolistelement.rs b/components/script/dom/htmlolistelement.rs index ec27e04ab0a..9b1ce403d88 100644 --- a/components/script/dom/htmlolistelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index 26c541daa8d..814914d325d 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index dbb3486052c..5bb462a032c 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index 48a8dd40ff6..b8633886b2e 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/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()) } } - diff --git a/components/script/dom/htmlparagraphelement.rs b/components/script/dom/htmlparagraphelement.rs index 3c39eb42925..abda9483aef 100644 --- a/components/script/dom/htmlparagraphelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlparamelement.rs b/components/script/dom/htmlparamelement.rs index e1c5a2deea6..d8a18d3d152 100644 --- a/components/script/dom/htmlparamelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlpreelement.rs b/components/script/dom/htmlpreelement.rs index bb5000b895b..a105f1fd559 100644 --- a/components/script/dom/htmlpreelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/htmlprogresselement.rs index ea507d36fbc..373d914c97f 100644 --- a/components/script/dom/htmlprogresselement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlquoteelement.rs b/components/script/dom/htmlquoteelement.rs index 8162bcb5244..49b5f0853a5 100644 --- a/components/script/dom/htmlquoteelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 4e40712ad63..64ab605ba40 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/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, diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 1bd374f9662..cb30c4ad81e 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs index 1d1294883f4..ea6b163c539 100644 --- a/components/script/dom/htmlsourceelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlspanelement.rs b/components/script/dom/htmlspanelement.rs index 2cb3f766767..e6e2a1f4bcd 100644 --- a/components/script/dom/htmlspanelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index a07b02d5eb2..24b903dc693 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmltablecaptionelement.rs b/components/script/dom/htmltablecaptionelement.rs index 80d643e338a..8c74e526756 100644 --- a/components/script/dom/htmltablecaptionelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index 1cec04ff377..e992b6c83ed 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/htmltablecolelement.rs index 24cbd7ae335..45e94518f65 100644 --- a/components/script/dom/htmltablecolelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmltabledatacellelement.rs b/components/script/dom/htmltabledatacellelement.rs index 248374948fc..691aad8644a 100644 --- a/components/script/dom/htmltabledatacellelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 5a3286bc924..1eb4f2b9818 100644 --- a/components/script/dom/htmltableelement.rs +++ b/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 { } } } - diff --git a/components/script/dom/htmltableheadercellelement.rs b/components/script/dom/htmltableheadercellelement.rs index 8b5cc867354..579167ebd0b 100644 --- a/components/script/dom/htmltableheadercellelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs index 180b641cb10..3526c4ab122 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/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>>, diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs index aadb6583c4c..c9bcb7366f9 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/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>>, diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/htmltemplateelement.rs index 099e0f2975c..86e69b31a64 100644 --- a/components/script/dom/htmltemplateelement.rs +++ b/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) } } - diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index fc76280c121..cdc6efa963b 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/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"] diff --git a/components/script/dom/htmltimeelement.rs b/components/script/dom/htmltimeelement.rs index 4a94581a386..2f1bf7bb5a1 100644 --- a/components/script/dom/htmltimeelement.rs +++ b/components/script/dom/htmltimeelement.rs @@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLTimeElement { htmlelement: HTMLElement } @@ -41,4 +40,3 @@ impl HTMLTimeElement { Node::reflect_node(box element, document, HTMLTimeElementBinding::Wrap) } } - diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index d7e545595d0..691ab057984 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -19,7 +19,6 @@ use dom::virtualmethods::VirtualMethods; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLTitleElement { htmlelement: HTMLElement, } diff --git a/components/script/dom/htmltrackelement.rs b/components/script/dom/htmltrackelement.rs index df3582483ec..63d7efbc630 100644 --- a/components/script/dom/htmltrackelement.rs +++ b/components/script/dom/htmltrackelement.rs @@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLTrackElement { htmlelement: HTMLElement, } @@ -41,4 +40,3 @@ impl HTMLTrackElement { Node::reflect_node(box element, document, HTMLTrackElementBinding::Wrap) } } - diff --git a/components/script/dom/htmlulistelement.rs b/components/script/dom/htmlulistelement.rs index 0ec7be9d5ca..a8c6102e5ae 100644 --- a/components/script/dom/htmlulistelement.rs +++ b/components/script/dom/htmlulistelement.rs @@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLUListElement { htmlelement: HTMLElement } @@ -41,4 +40,3 @@ impl HTMLUListElement { Node::reflect_node(box element, document, HTMLUListElementBinding::Wrap) } } - diff --git a/components/script/dom/htmlunknownelement.rs b/components/script/dom/htmlunknownelement.rs index a4f35a35534..43b0c2834b8 100644 --- a/components/script/dom/htmlunknownelement.rs +++ b/components/script/dom/htmlunknownelement.rs @@ -13,7 +13,6 @@ use dom::node::{Node, NodeTypeId}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLUnknownElement { htmlelement: HTMLElement } @@ -44,4 +43,3 @@ impl HTMLUnknownElement { Node::reflect_node(box element, document, HTMLUnknownElementBinding::Wrap) } } - diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/htmlvideoelement.rs index 1ccd7f8eb0c..b97d853b700 100644 --- a/components/script/dom/htmlvideoelement.rs +++ b/components/script/dom/htmlvideoelement.rs @@ -14,7 +14,6 @@ use dom::node::{Node, NodeTypeId}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct HTMLVideoElement { htmlmediaelement: HTMLMediaElement } @@ -44,4 +43,3 @@ impl HTMLVideoElement { Node::reflect_node(box element, document, HTMLVideoElementBinding::Wrap) } } - diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 88ed652f752..0c2838628ff 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -18,7 +18,6 @@ use std::vec::Vec; #[dom_struct] #[allow(raw_pointer_derive)] -#[derive(HeapSizeOf)] pub struct ImageData { reflector_: Reflector, width: u32, diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index 1dbbcb97a2b..963ae679c62 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -24,7 +24,6 @@ use std::cell::{RefCell, Cell}; no_jsmanaged_fields!(Key); #[dom_struct] -#[derive(HeapSizeOf)] pub struct KeyboardEvent { uievent: UIEvent, key: Cell<Option<Key>>, diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index e17bd16a513..25c3255f850 100644 --- a/components/script/dom/location.rs +++ b/components/script/dom/location.rs @@ -16,7 +16,6 @@ use url::{Url, UrlParser}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct Location { reflector_: Reflector, window: JS<Window>, diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index a445dd4bcd9..2fdac8238d6 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -22,7 +22,6 @@ use std::borrow::ToOwned; use std::default::Default; #[dom_struct] -#[derive(HeapSizeOf)] pub struct MessageEvent { event: Event, data: Heap<JSVal>, @@ -106,4 +105,3 @@ impl<'a> MessageEventMethods for &'a MessageEvent { self.lastEventId.clone() } } - diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 08cd4543e54..2a97104d740 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -20,7 +20,6 @@ use util::opts; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct MouseEvent { uievent: UIEvent, screen_x: Cell<i32>, diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs index 829e97519a2..ba436d4845b 100644 --- a/components/script/dom/namednodemap.rs +++ b/components/script/dom/namednodemap.rs @@ -16,7 +16,6 @@ use util::str::DOMString; use string_cache::Atom; #[dom_struct] -#[derive(HeapSizeOf)] pub struct NamedNodeMap { reflector_: Reflector, owner: JS<Element>, diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index c88e2bf3aa5..4f08281c1a1 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -12,7 +12,6 @@ use dom::window::Window; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct Navigator { reflector_: Reflector, } @@ -67,4 +66,3 @@ impl<'a> NavigatorMethods for &'a Navigator { navigatorinfo::AppVersion() } } - diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 37a24207c8c..2297c52fa83 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -78,7 +78,6 @@ use uuid; /// An HTML node. #[dom_struct] -#[derive(HeapSizeOf)] pub struct Node { /// The JavaScript reflector for this node. eventtarget: EventTarget, diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs index d1194c1326a..ec12b951b23 100644 --- a/components/script/dom/nodeiterator.rs +++ b/components/script/dom/nodeiterator.rs @@ -19,7 +19,6 @@ use std::cell::Cell; use std::rc::Rc; #[dom_struct] -#[derive(HeapSizeOf)] pub struct NodeIterator { reflector_: Reflector, root_node: JS<Node>, diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index bcf941a6aa0..eb3353a4d6e 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -22,7 +22,6 @@ pub enum NodeListType { // https://dom.spec.whatwg.org/#interface-nodelist #[dom_struct] -#[derive(HeapSizeOf)] pub struct NodeList { reflector_: Reflector, list_type: NodeListType, diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs index 71ed3b186ea..703090fb326 100644 --- a/components/script/dom/performance.rs +++ b/components/script/dom/performance.rs @@ -15,7 +15,6 @@ use time; pub type DOMHighResTimeStamp = Finite<f64>; #[dom_struct] -#[derive(HeapSizeOf)] pub struct Performance { reflector_: Reflector, timing: JS<PerformanceTiming>, @@ -57,4 +56,3 @@ impl<'a> PerformanceMethods for &'a Performance { Finite::wrap(now) } } - diff --git a/components/script/dom/performancetiming.rs b/components/script/dom/performancetiming.rs index d1588f72927..1bb6eb4aa65 100644 --- a/components/script/dom/performancetiming.rs +++ b/components/script/dom/performancetiming.rs @@ -10,7 +10,6 @@ use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::window::Window; #[dom_struct] -#[derive(HeapSizeOf)] pub struct PerformanceTiming { reflector_: Reflector, navigationStart: u64, @@ -56,4 +55,3 @@ impl<'a> PerformanceTimingHelpers for &'a PerformanceTiming { self.navigationStartPrecise } } - diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs index 6b4ae05f592..9bd7a9d5d5f 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.rs @@ -14,7 +14,6 @@ use util::str::DOMString; /// An HTML processing instruction node. #[dom_struct] -#[derive(HeapSizeOf)] pub struct ProcessingInstruction { characterdata: CharacterData, target: DOMString, @@ -57,4 +56,3 @@ impl<'a> ProcessingInstructionMethods for &'a ProcessingInstruction { self.target.clone() } } - diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index 20af2b68d1c..8012ff00b53 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -14,7 +14,6 @@ use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct ProgressEvent { event: Event, length_computable: bool, @@ -78,4 +77,3 @@ impl<'a> ProgressEventMethods for &'a ProgressEvent { self.total } } - diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index c0e832e7ae4..fa0843bf00a 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -26,7 +26,6 @@ use std::cmp::{Ord, Ordering, PartialEq, PartialOrd}; use std::rc::Rc; #[dom_struct] -#[derive(HeapSizeOf)] pub struct Range { reflector_: Reflector, inner: Rc<RefCell<RangeInner>>, diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs index 831fd393670..84a439735c4 100644 --- a/components/script/dom/screen.rs +++ b/components/script/dom/screen.rs @@ -10,7 +10,6 @@ use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::window::Window; #[dom_struct] -#[derive(HeapSizeOf)] pub struct Screen { reflector_: Reflector, } @@ -40,4 +39,3 @@ impl<'a> ScreenMethods for &'a Screen { 24 } } - diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index 63cb459379f..2450b4c8aa3 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -157,7 +157,6 @@ impl PreInvoke for ParserContext { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct ServoHTMLParser { reflector_: Reflector, #[ignore_heap_size_of = "Defined in html5ever"] diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 6ee0d3c9ccd..8d5d78d56a6 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -23,7 +23,6 @@ use url::Url; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct Storage { reflector_: Reflector, global: GlobalField, diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index 7fd1c039284..8f722ece866 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -17,7 +17,6 @@ use dom::storage::Storage; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct StorageEvent { event: Event, key: DOMRefCell<Option<DOMString>>, diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index e61b12eee7b..08df44b77ef 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -30,7 +30,6 @@ use std::ptr; use std::rc::Rc; #[dom_struct] -#[derive(HeapSizeOf)] pub struct TestBinding { reflector_: Reflector, global: GlobalField, diff --git a/components/script/dom/testbindingproxy.rs b/components/script/dom/testbindingproxy.rs index 57b925e8d55..8241811761f 100644 --- a/components/script/dom/testbindingproxy.rs +++ b/components/script/dom/testbindingproxy.rs @@ -10,7 +10,6 @@ use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct TestBindingProxy { reflector_: Reflector } diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index d5f314ab0c6..90913d85982 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.rs @@ -21,7 +21,6 @@ use util::str::DOMString; /// An HTML text node. #[dom_struct] -#[derive(HeapSizeOf)] pub struct Text { characterdata: CharacterData, } @@ -102,4 +101,3 @@ impl<'a> TextMethods for &'a Text { text } } - diff --git a/components/script/dom/textdecoder.rs b/components/script/dom/textdecoder.rs index c921dc68289..822793f0a7a 100644 --- a/components/script/dom/textdecoder.rs +++ b/components/script/dom/textdecoder.rs @@ -24,7 +24,6 @@ use std::ptr; use std::slice; #[dom_struct] -#[derive(HeapSizeOf)] pub struct TextDecoder { reflector_: Reflector, #[ignore_heap_size_of = "Defined in rust-encoding"] diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs index 47a23681e74..53f356b2785 100644 --- a/components/script/dom/textencoder.rs +++ b/components/script/dom/textencoder.rs @@ -25,7 +25,6 @@ use js::jsapi::{JS_NewUint8Array, JS_GetUint8ArrayData}; use libc::uint8_t; #[dom_struct] -#[derive(HeapSizeOf)] pub struct TextEncoder { reflector_: Reflector, encoding: DOMString, diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index cc90a0ab23e..4c2fa150c5b 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -24,6 +24,7 @@ pub struct TreeWalker { root_node: JS<Node>, current_node: MutHeap<JS<Node>>, what_to_show: u32, + #[ignore_heap_size_of = "function pointers and Rc<T> are hard"] filter: Filter } diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index abccf1abcd2..61a961b0049 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -28,7 +28,6 @@ pub enum UIEventTypeId { // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#interface-UIEvent #[dom_struct] -#[derive(HeapSizeOf)] pub struct UIEvent { event: Event, view: MutNullableHeap<JS<Window>>, @@ -115,4 +114,3 @@ impl<'a> UIEventMethods for &'a UIEvent { self.detail.set(detail); } } - diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index daba091955c..d8db8329ab1 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -17,7 +17,6 @@ use std::borrow::ToOwned; // https://url.spec.whatwg.org/#url #[dom_struct] -#[derive(HeapSizeOf)] pub struct URL { reflector_: Reflector, diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index e4bc0a8b30d..f51440f51df 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -18,7 +18,6 @@ use util::str::DOMString; // https://url.spec.whatwg.org/#interface-urlsearchparams #[dom_struct] -#[derive(HeapSizeOf)] pub struct URLSearchParams { reflector_: Reflector, // https://url.spec.whatwg.org/#concept-urlsearchparams-list diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index f14ebddff6f..c6288145d93 100644 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -10,7 +10,6 @@ use dom::window::Window; // https://html.spec.whatwg.org/#validitystate #[dom_struct] -#[derive(HeapSizeOf)] pub struct ValidityState { reflector_: Reflector, state: u8, @@ -30,4 +29,3 @@ impl ValidityState { ValidityStateBinding::Wrap) } } - diff --git a/components/script/dom/webglactiveinfo.rs b/components/script/dom/webglactiveinfo.rs index 3bbcfd7dee2..5d6ed75fe92 100644 --- a/components/script/dom/webglactiveinfo.rs +++ b/components/script/dom/webglactiveinfo.rs @@ -11,7 +11,6 @@ use dom::bindings::utils::{Reflector, reflect_dom_object}; use util::str::DOMString; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLActiveInfo { reflector_: Reflector, size: i32, diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs index 6f958d62597..f3d8874de8f 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webglbuffer.rs @@ -14,7 +14,6 @@ use ipc_channel::ipc::{self, IpcSender}; use std::cell::Cell; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLBuffer { webgl_object: WebGLObject, id: u32, diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webglframebuffer.rs index 790cb46c3c4..c16435f0298 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webglframebuffer.rs @@ -14,7 +14,6 @@ use ipc_channel::ipc::{self, IpcSender}; use std::cell::Cell; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLFramebuffer { webgl_object: WebGLObject, id: u32, diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs index ea31d7364e7..c950768e329 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webglobject.rs @@ -9,7 +9,6 @@ use dom::bindings::js::Root; use dom::bindings::utils::{Reflector, reflect_dom_object}; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLObject { reflector_: Reflector, } diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs index e4f598285d3..7aee6ad496a 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webglprogram.rs @@ -18,7 +18,6 @@ use ipc_channel::ipc::{self, IpcSender}; use std::cell::Cell; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLProgram { webgl_object: WebGLObject, id: u32, diff --git a/components/script/dom/webglrenderbuffer.rs b/components/script/dom/webglrenderbuffer.rs index ed68e6277be..fb286c88bb4 100644 --- a/components/script/dom/webglrenderbuffer.rs +++ b/components/script/dom/webglrenderbuffer.rs @@ -14,7 +14,6 @@ use ipc_channel::ipc::{self, IpcSender}; use std::cell::Cell; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLRenderbuffer { webgl_object: WebGLObject, id: u32, diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index c7f6ca54885..4b9f4d5795e 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -75,7 +75,6 @@ bitflags! { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLRenderingContext { reflector_: Reflector, global: GlobalField, diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs index 3fe107d9f67..d18836419eb 100644 --- a/components/script/dom/webglshader.rs +++ b/components/script/dom/webglshader.rs @@ -17,7 +17,6 @@ use std::cell::Cell; use std::cell::RefCell; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLShader { webgl_object: WebGLObject, id: u32, @@ -125,4 +124,3 @@ impl<'a> WebGLShaderHelpers for &'a WebGLShader { self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::ShaderSource(self.id, source))).unwrap() } } - diff --git a/components/script/dom/webglshaderprecisionformat.rs b/components/script/dom/webglshaderprecisionformat.rs index 5c7d4232b88..c37db3991d7 100644 --- a/components/script/dom/webglshaderprecisionformat.rs +++ b/components/script/dom/webglshaderprecisionformat.rs @@ -10,7 +10,6 @@ use dom::bindings::js::Root; use dom::bindings::utils::{Reflector, reflect_dom_object}; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLShaderPrecisionFormat { reflector_: Reflector, range_min: i32, diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgltexture.rs index 7fa44178155..b14e8e85fe1 100644 --- a/components/script/dom/webgltexture.rs +++ b/components/script/dom/webgltexture.rs @@ -20,7 +20,6 @@ pub enum TexParameterValue { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLTexture { webgl_object: WebGLObject, id: u32, diff --git a/components/script/dom/webgluniformlocation.rs b/components/script/dom/webgluniformlocation.rs index add5da9f928..2eb9895ce70 100644 --- a/components/script/dom/webgluniformlocation.rs +++ b/components/script/dom/webgluniformlocation.rs @@ -9,7 +9,6 @@ use dom::bindings::js::Root; use dom::bindings::utils::{Reflector, reflect_dom_object}; #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebGLUniformLocation { reflector_: Reflector, id: i32, diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 9bd0610d666..a3fed7616e2 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -67,7 +67,6 @@ enum MessageData { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct WebSocket { eventtarget: EventTarget, url: Url, diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index c6bfcd2519e..6ca00fefbb6 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -105,7 +105,6 @@ pub enum ReflowReason { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct Window { eventtarget: EventTarget, #[ignore_heap_size_of = "trait objects are hard"] diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 2ba0e1e3f62..c6226021afe 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -39,7 +39,6 @@ pub type TrustedWorkerAddress = Trusted<Worker>; // https://html.spec.whatwg.org/multipage/#worker #[dom_struct] -#[derive(HeapSizeOf)] pub struct Worker { eventtarget: EventTarget, global: GlobalField, diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 18f7f442d30..346396fc300 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -53,7 +53,6 @@ pub struct WorkerGlobalScopeInit { // https://html.spec.whatwg.org/multipage/#the-workerglobalscope-common-interface #[dom_struct] -#[derive(HeapSizeOf)] pub struct WorkerGlobalScope { eventtarget: EventTarget, worker_id: WorkerId, diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index f4f9209445a..58d30699653 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -16,7 +16,6 @@ use util::str::DOMString; // https://html.spec.whatwg.org/multipage/#worker-locations #[dom_struct] -#[derive(HeapSizeOf)] pub struct WorkerLocation { reflector_: Reflector, url: Url, @@ -83,4 +82,3 @@ impl<'a> WorkerLocationMethods for &'a WorkerLocation { self.Href().0 } } - diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index f7330f7db69..f8864734c17 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -13,7 +13,6 @@ use util::str::DOMString; // https://html.spec.whatwg.org/multipage/#workernavigator #[dom_struct] -#[derive(HeapSizeOf)] pub struct WorkerNavigator { reflector_: Reflector, } @@ -68,4 +67,3 @@ impl<'a> WorkerNavigatorMethods for &'a WorkerNavigator { navigatorinfo::AppVersion() } } - diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 40325fdcf49..54d62301ddb 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -116,7 +116,6 @@ impl XHRProgress { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct XMLHttpRequest { eventtarget: XMLHttpRequestEventTarget, ready_state: Cell<XMLHttpRequestState>, diff --git a/components/script/dom/xmlhttprequesteventtarget.rs b/components/script/dom/xmlhttprequesteventtarget.rs index 031d0cd3641..548104e9435 100644 --- a/components/script/dom/xmlhttprequesteventtarget.rs +++ b/components/script/dom/xmlhttprequesteventtarget.rs @@ -15,7 +15,6 @@ pub enum XMLHttpRequestEventTargetTypeId { } #[dom_struct] -#[derive(HeapSizeOf)] pub struct XMLHttpRequestEventTarget { eventtarget: EventTarget, } diff --git a/components/script/dom/xmlhttprequestupload.rs b/components/script/dom/xmlhttprequestupload.rs index 5753117863b..d112d9d1e08 100644 --- a/components/script/dom/xmlhttprequestupload.rs +++ b/components/script/dom/xmlhttprequestupload.rs @@ -12,7 +12,6 @@ use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget; use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTargetTypeId; #[dom_struct] -#[derive(HeapSizeOf)] pub struct XMLHttpRequestUpload { eventtarget: XMLHttpRequestEventTarget } |