From f12a7526a41c43ac192236eed514f7900fd7e6eb Mon Sep 17 00:00:00 2001 From: Wellington Cordeiro Date: Fri, 30 Sep 2016 12:07:39 -0600 Subject: [PATCH 1/2] Remove ignore-heap-size comment to enable memory measurement on HashSet --- components/script/dom/window.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 30d51a31c4c..10d47f161be 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -195,7 +195,6 @@ pub struct Window { devtools_chan: Option>, /// For sending timeline markers. Will be ignored if /// no devtools server - #[ignore_heap_size_of = "TODO(#6909) need to measure HashSet"] devtools_markers: DOMRefCell>, #[ignore_heap_size_of = "channels are hard"] devtools_marker_sender: DOMRefCell>>, From 39e5725063031ea9c77677cc8d3880a95a922715 Mon Sep 17 00:00:00 2001 From: Wellington Cordeiro Date: Fri, 30 Sep 2016 16:07:25 -0600 Subject: [PATCH 2/2] Derive the HeapSizeOf on TimelineMarkerType --- components/devtools_traits/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 4edf19d6f02..b7711821112 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -145,7 +145,7 @@ pub struct TimelineMarker { pub end_stack: Option>, } -#[derive(PartialEq, Eq, Hash, Clone, Deserialize, Serialize)] +#[derive(PartialEq, Eq, Hash, Clone, Deserialize, Serialize, HeapSizeOf)] pub enum TimelineMarkerType { Reflow, DOMEvent,