diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-13 13:16:14 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-13 13:16:14 -0600 |
| commit | a03616f379c255cc6c9b6e1d04dd7d98bd9926ce (patch) | |
| tree | 0081f3c1bb513706b406a61fba0f73449cbc5ba4 /components/script/dom/servohtmlparser.rs | |
| parent | f3b7c5cb4b0fab20db51b7560c3b3bb2d115be69 (diff) | |
| parent | 45145108daa6af7e834a7c23530857c504b54b9c (diff) | |
| download | servo-a03616f379c255cc6c9b6e1d04dd7d98bd9926ce.tar.gz servo-a03616f379c255cc6c9b6e1d04dd7d98bd9926ce.zip | |
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 -->
Diffstat (limited to 'components/script/dom/servohtmlparser.rs')
| -rw-r--r-- | components/script/dom/servohtmlparser.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index a81fe125973..c14603df876 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -36,7 +36,7 @@ use hyper::header::ContentType; use hyper::mime::{Mime, TopLevel, SubLevel}; #[must_root] -#[derive(JSTraceable)] +#[derive(JSTraceable, HeapSizeOf)] pub struct Sink { pub base_url: Option<Url>, pub document: JS<Document>, @@ -157,8 +157,10 @@ impl PreInvoke for ParserContext { } #[dom_struct] +#[derive(HeapSizeOf)] pub struct ServoHTMLParser { reflector_: Reflector, + #[ignore_heap_size_of = "Defined in html5ever"] tokenizer: DOMRefCell<Tokenizer>, /// Input chunks received but not yet passed to the parser. pending_input: DOMRefCell<Vec<String>>, |