1f705facf2
This patch replaces the handwritten MallocSizeOf implementation for PropertyDeclaration with a derived one, which gives much more thorough measurement. This requires (a) deriving MallocSizeOf for a *lot* of additional types (most of which already have `derive(HeapSizeOf)` in Servo builds), and (b) implementing MallocSizeOf for a few more types in the `malloc_size_of` crate. These changes would significantly improve the reporting coverage for gmail if it weren't for the fact that SpecifiedUrl isn't measured due to a lack of clarity about its fields; that can be fixed as a follow-up once bug 1397971 has landed. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because testing is on the Gecko side. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 097cea240fe9b1d96fa4ef5ffa984f09e0bd04f3
111 lines
3.4 KiB
Rust
111 lines
3.4 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 CSS values related to effects.
|
|
|
|
use std::fmt;
|
|
use style_traits::values::{SequenceWriter, ToCss};
|
|
#[cfg(feature = "gecko")]
|
|
use values::specified::url::SpecifiedUrl;
|
|
|
|
/// A generic value for a single `box-shadow`.
|
|
#[cfg_attr(feature = "gecko", derive(MallocSizeOf))]
|
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
|
#[derive(Animate, Clone, Debug, PartialEq)]
|
|
#[derive(ToAnimatedValue, ToAnimatedZero)]
|
|
pub struct BoxShadow<Color, SizeLength, BlurShapeLength, ShapeLength> {
|
|
/// The base shadow.
|
|
pub base: SimpleShadow<Color, SizeLength, BlurShapeLength>,
|
|
/// The spread radius.
|
|
pub spread: ShapeLength,
|
|
/// Whether this is an inset box shadow.
|
|
#[animation(constant)]
|
|
pub inset: bool,
|
|
}
|
|
|
|
/// A generic value for a single `filter`.
|
|
#[cfg_attr(feature = "gecko", derive(MallocSizeOf))]
|
|
#[cfg_attr(feature = "servo", derive(Deserialize, HeapSizeOf, Serialize))]
|
|
#[derive(Clone, Debug, PartialEq, ToAnimatedValue, ToComputedValue, ToCss)]
|
|
pub enum Filter<Angle, Factor, Length, DropShadow> {
|
|
/// `blur(<length>)`
|
|
#[css(function)]
|
|
Blur(Length),
|
|
/// `brightness(<factor>)`
|
|
#[css(function)]
|
|
Brightness(Factor),
|
|
/// `contrast(<factor>)`
|
|
#[css(function)]
|
|
Contrast(Factor),
|
|
/// `grayscale(<factor>)`
|
|
#[css(function)]
|
|
Grayscale(Factor),
|
|
/// `hue-rotate(<angle>)`
|
|
#[css(function)]
|
|
HueRotate(Angle),
|
|
/// `invert(<factor>)`
|
|
#[css(function)]
|
|
Invert(Factor),
|
|
/// `opacity(<factor>)`
|
|
#[css(function)]
|
|
Opacity(Factor),
|
|
/// `saturate(<factor>)`
|
|
#[css(function)]
|
|
Saturate(Factor),
|
|
/// `sepia(<factor>)`
|
|
#[css(function)]
|
|
Sepia(Factor),
|
|
/// `drop-shadow(...)`
|
|
#[css(function)]
|
|
DropShadow(DropShadow),
|
|
/// `<url>`
|
|
#[cfg(feature = "gecko")]
|
|
Url(SpecifiedUrl),
|
|
}
|
|
|
|
/// A generic value for the `drop-shadow()` filter and the `text-shadow` property.
|
|
///
|
|
/// Contrary to the canonical order from the spec, the color is serialised
|
|
/// first, like in Gecko and Webkit.
|
|
#[cfg_attr(feature = "gecko", derive(MallocSizeOf))]
|
|
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
|
#[derive(Animate, Clone, ComputeSquaredDistance, Debug)]
|
|
#[derive(PartialEq, ToAnimatedValue, ToAnimatedZero, ToCss)]
|
|
pub struct SimpleShadow<Color, SizeLength, ShapeLength> {
|
|
/// Color.
|
|
pub color: Color,
|
|
/// Horizontal radius.
|
|
pub horizontal: SizeLength,
|
|
/// Vertical radius.
|
|
pub vertical: SizeLength,
|
|
/// Blur radius.
|
|
pub blur: ShapeLength,
|
|
}
|
|
|
|
impl<Color, SizeLength, BlurShapeLength, ShapeLength> ToCss for BoxShadow<Color,
|
|
SizeLength,
|
|
BlurShapeLength,
|
|
ShapeLength>
|
|
where
|
|
Color: ToCss,
|
|
SizeLength: ToCss,
|
|
BlurShapeLength: ToCss,
|
|
ShapeLength: ToCss,
|
|
{
|
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result
|
|
where
|
|
W: fmt::Write,
|
|
{
|
|
{
|
|
let mut writer = SequenceWriter::new(&mut *dest, " ");
|
|
writer.item(&self.base)?;
|
|
writer.item(&self.spread)?;
|
|
}
|
|
if self.inset {
|
|
dest.write_str(" inset")?;
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|