mirror of
https://github.com/servo/servo.git
synced 2025-06-23 08:34:42 +01:00
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`.
130 lines
3.5 KiB
Rust
130 lines
3.5 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
//! Generic types for text properties.
|
|
|
|
use app_units::Au;
|
|
use cssparser::Parser;
|
|
use parser::ParserContext;
|
|
use style_traits::ParseError;
|
|
use values::animated::{Animate, Procedure, ToAnimatedZero};
|
|
use values::distance::{ComputeSquaredDistance, SquaredDistance};
|
|
|
|
/// A generic value for the `initial-letter` property.
|
|
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToCss)]
|
|
pub enum InitialLetter<Number, Integer> {
|
|
/// `normal`
|
|
Normal,
|
|
/// `<number> <integer>?`
|
|
Specified(Number, Option<Integer>),
|
|
}
|
|
|
|
impl<N, I> InitialLetter<N, I> {
|
|
/// Returns `normal`.
|
|
#[inline]
|
|
pub fn normal() -> Self {
|
|
InitialLetter::Normal
|
|
}
|
|
}
|
|
|
|
/// A generic spacing value for the `letter-spacing` and `word-spacing` properties.
|
|
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToCss)]
|
|
pub enum Spacing<Value> {
|
|
/// `normal`
|
|
Normal,
|
|
/// `<value>`
|
|
Value(Value),
|
|
}
|
|
|
|
impl<Value> Spacing<Value> {
|
|
/// Returns `normal`.
|
|
#[inline]
|
|
pub fn normal() -> Self {
|
|
Spacing::Normal
|
|
}
|
|
|
|
/// Parses.
|
|
#[inline]
|
|
pub fn parse_with<'i, 't, F>(
|
|
context: &ParserContext,
|
|
input: &mut Parser<'i, 't>,
|
|
parse: F)
|
|
-> Result<Self, ParseError<'i>>
|
|
where F: FnOnce(&ParserContext, &mut Parser<'i, 't>) -> Result<Value, ParseError<'i>>
|
|
{
|
|
if input.try(|i| i.expect_ident_matching("normal")).is_ok() {
|
|
return Ok(Spacing::Normal);
|
|
}
|
|
parse(context, input).map(Spacing::Value)
|
|
}
|
|
|
|
/// Returns the spacing value, if not `normal`.
|
|
#[inline]
|
|
pub fn value(&self) -> Option<&Value> {
|
|
match *self {
|
|
Spacing::Normal => None,
|
|
Spacing::Value(ref value) => Some(value),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<Value> Animate for Spacing<Value>
|
|
where
|
|
Value: Animate + From<Au>,
|
|
{
|
|
#[inline]
|
|
fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
|
|
if let (&Spacing::Normal, &Spacing::Normal) = (self, other) {
|
|
return Ok(Spacing::Normal);
|
|
}
|
|
let zero = Value::from(Au(0));
|
|
let this = self.value().unwrap_or(&zero);
|
|
let other = other.value().unwrap_or(&zero);
|
|
Ok(Spacing::Value(this.animate(other, procedure)?))
|
|
}
|
|
}
|
|
|
|
impl<V> ComputeSquaredDistance for Spacing<V>
|
|
where
|
|
V: ComputeSquaredDistance + From<Au>,
|
|
{
|
|
#[inline]
|
|
fn compute_squared_distance(&self, other: &Self) -> Result<SquaredDistance, ()> {
|
|
let zero = V::from(Au(0));
|
|
let this = self.value().unwrap_or(&zero);
|
|
let other = other.value().unwrap_or(&zero);
|
|
this.compute_squared_distance(other)
|
|
}
|
|
}
|
|
|
|
impl<V> ToAnimatedZero for Spacing<V>
|
|
where
|
|
V: From<Au>,
|
|
{
|
|
#[inline]
|
|
fn to_animated_zero(&self) -> Result<Self, ()> { Err(()) }
|
|
}
|
|
|
|
/// A generic value for the `line-height` property.
|
|
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug)]
|
|
#[derive(MallocSizeOf, PartialEq, ToAnimatedValue, ToCss)]
|
|
pub enum LineHeight<Number, LengthOrPercentage> {
|
|
/// `normal`
|
|
Normal,
|
|
/// `-moz-block-height`
|
|
#[cfg(feature = "gecko")]
|
|
MozBlockHeight,
|
|
/// `<number>`
|
|
Number(Number),
|
|
/// `<length-or-percentage>`
|
|
Length(LengthOrPercentage),
|
|
}
|
|
|
|
impl<N, L> LineHeight<N, L> {
|
|
/// Returns `normal`.
|
|
#[inline]
|
|
pub fn normal() -> Self {
|
|
LineHeight::Normal
|
|
}
|
|
}
|