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/filereader.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/filereader.rs')
| -rw-r--r-- | components/script/dom/filereader.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 2e0cec633ed..ebf67ded61a 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -29,7 +29,7 @@ use util::str::DOMString; use util::task::spawn_named; use rustc_serialize::base64::{Config, ToBase64, CharacterSet, Newline}; -#[derive(PartialEq, Clone, Copy, JSTraceable)] +#[derive(PartialEq, Clone, Copy, JSTraceable, HeapSizeOf)] pub enum FileReaderFunction { ReadAsText, ReadAsDataUrl, @@ -37,7 +37,7 @@ pub enum FileReaderFunction { pub type TrustedFileReader = Trusted<FileReader>; -#[derive(Clone)] +#[derive(Clone, HeapSizeOf)] pub struct ReadMetaData { pub blobtype: DOMString, pub label: Option<DOMString>, @@ -55,11 +55,11 @@ impl ReadMetaData { } } -#[derive(PartialEq, Clone, Copy, JSTraceable)] +#[derive(PartialEq, Clone, Copy, JSTraceable, HeapSizeOf)] pub struct GenerationId(u32); #[repr(u16)] -#[derive(Copy, Clone, Debug, PartialEq, JSTraceable)] +#[derive(Copy, Clone, Debug, PartialEq, JSTraceable, HeapSizeOf)] pub enum FileReaderReadyState { Empty = FileReaderConstants::EMPTY, Loading = FileReaderConstants::LOADING, @@ -67,6 +67,7 @@ pub enum FileReaderReadyState { } #[dom_struct] +#[derive(HeapSizeOf)] pub struct FileReader { eventtarget: EventTarget, global: GlobalField, |