diff options
author | Nicholas Nethercote <nnethercote@mozilla.com> | 2017-10-18 10:42:01 +1100 |
---|---|---|
committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2017-10-18 22:20:37 +1100 |
commit | 4506f0d30cbbb02df32e9c16135ef288ad6b7e2e (patch) | |
tree | 9a3de6bfdfabc6dee92352fb18df31e2468acf07 /components/style/servo/selector_parser.rs | |
parent | 421baa854ea40c7b1a3d1e75acac14da04a3fbcc (diff) | |
download | servo-4506f0d30cbbb02df32e9c16135ef288ad6b7e2e.tar.gz servo-4506f0d30cbbb02df32e9c16135ef288ad6b7e2e.zip |
Replace all uses of the `heapsize` crate with `malloc_size_of`.
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`.
`malloc_size_of` is better -- it handles various cases that `heapsize` does not
-- so this patch changes Servo to use `malloc_size_of`.
This patch makes the following changes to the `malloc_size_of` crate.
- Adds `MallocSizeOf` trait implementations for numerous types, some built-in
(e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`).
- Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't
support that operation.
- For `HashSet`/`HashMap`, falls back to a computed estimate when
`enclosing_size_of_op` isn't available.
- Adds an extern "C" `malloc_size_of` function that does the actual heap
measurement; this is based on the same functions from the `heapsize` crate.
This patch makes the following changes elsewhere.
- Converts all the uses of `heapsize` to instead use `malloc_size_of`.
- Disables the "heapsize"/"heap_size" feature for the external crates that
provide it.
- Removes the `HeapSizeOf` implementation from `hashglobe`.
- Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of`
doesn't derive those types, unlike `heapsize`.
Diffstat (limited to 'components/style/servo/selector_parser.rs')
-rw-r--r-- | components/style/servo/selector_parser.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs index 719e76f42f2..bffb436cf1c 100644 --- a/components/style/servo/selector_parser.rs +++ b/components/style/servo/selector_parser.rs @@ -30,7 +30,7 @@ use style_traits::{ParseError, StyleParseErrorKind}; /// /// NB: If you add to this list, be sure to update `each_simple_pseudo_element` too. #[derive(Clone, Debug, Eq, Hash, PartialEq)] -#[cfg_attr(feature = "servo", derive(HeapSizeOf))] +#[cfg_attr(feature = "servo", derive(MallocSizeOf))] #[allow(missing_docs)] #[repr(usize)] pub enum PseudoElement { @@ -251,7 +251,7 @@ pub type PseudoClassStringArg = Box<str>; /// A non tree-structural pseudo-class. /// See https://drafts.csswg.org/selectors-4/#structural-pseudos #[derive(Clone, Debug, Eq, Hash, PartialEq)] -#[cfg_attr(feature = "servo", derive(HeapSizeOf))] +#[cfg_attr(feature = "servo", derive(MallocSizeOf))] #[allow(missing_docs)] pub enum NonTSPseudoClass { Active, @@ -368,7 +368,7 @@ impl NonTSPseudoClass { /// The abstract struct we implement the selector parser implementation on top /// of. #[derive(Clone, Debug, PartialEq)] -#[cfg_attr(feature = "servo", derive(HeapSizeOf))] +#[cfg_attr(feature = "servo", derive(MallocSizeOf))] pub struct SelectorImpl; impl ::selectors::SelectorImpl for SelectorImpl { @@ -601,7 +601,7 @@ impl DerefMut for SnapshotMap { /// Servo's version of an element snapshot. #[derive(Debug)] -#[cfg_attr(feature = "servo", derive(HeapSizeOf))] +#[cfg_attr(feature = "servo", derive(MallocSizeOf))] pub struct ServoElementSnapshot { /// The stored state of the element. pub state: Option<ElementState>, |