Auto merge of #7097 - boghison:memtypes, r=jdm

Measure heap memory usage for more types. Fixes #6951

Also adds HeapSizeOf implementations/derive for some types. I've used "Cannot calculate Heap size" as a reason everywhere, because my imagination is rather limited. If you'd like me to change this message for specific types, please write something like this: "Trusted - Cannot calculate Heap size for Trusted" so that it would be easier for me to replace them through a script :)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7097)
<!-- Reviewable:end -->

1 files changed, 4 insertions, 2 deletions

diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs
index 0c6583a684d..bcf941a6aa0 100644
--- a/components/script/dom/nodelist.rs
+++ b/components/script/dom/nodelist.rs
@@ -13,7 +13,7 @@ use dom::window::Window;
 
 use std::cell::Cell;
 
-#[derive(JSTraceable)]
+#[derive(JSTraceable, HeapSizeOf)]
 #[must_root]
 pub enum NodeListType {
     Simple(Vec<JS<Node>>),
@@ -22,6 +22,7 @@ pub enum NodeListType {
 
 // https://dom.spec.whatwg.org/#interface-nodelist
 #[dom_struct]
+#[derive(HeapSizeOf)]
 pub struct NodeList {
     reflector_: Reflector,
     list_type: NodeListType,
@@ -93,10 +94,11 @@ impl<'a> NodeListHelpers<'a> for &'a NodeList {
     }
 }
 
-#[derive(JSTraceable)]
+#[derive(JSTraceable, HeapSizeOf)]
 #[must_root]
 pub struct ChildrenList {
     node: JS<Node>,
+    #[ignore_heap_size_of = "Defined in rust-mozjs"]
     last_visited: MutNullableHeap<JS<Node>>,
     last_index: Cell<u32>,
 }