Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Implement Animate trait and ComputeSquaredDistance trait for <ratio>.

Browse source 
I also update the wpt becasue it seems the original one lets <ratio>
support the addition. However, the spec says "Addition of <ratio>s is not
possible".

Differential Revision: https://phabricator.services.mozilla.com/D106219
This commit is contained in:
Boris Chiou 2021-02-25 01:50:55 +00:00 • committed by Emilio Cobos Álvarez
parent 52d39fc1bc
commit 0ef2410ea0
4 changed files with 83 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/style/values/generics/position.rs
View file

@ -5,6 +5,7 @@
//! Generic types for CSS handling of specified and computed values of
//! [`position`](https://drafts.csswg.org/css-backgrounds-3/#position)
use crate::values::animated::ToAnimatedZero;
use crate::values::generics::ratio::Ratio;
/// A generic type for representing a CSS [position](https://drafts.csswg.org/css-values/#position).
@ -163,7 +164,6 @@ impl<Integer> ZIndex<Integer> {
MallocSizeOf,
PartialEq,
SpecifiedValueInfo,
ToAnimatedZero,
ToComputedValue,
ToCss,
ToResolvedValue,
@ -175,7 +175,12 @@ pub enum PreferredRatio<N> {
#[css(skip)]
None,
/// With specified ratio
Ratio(#[css(field_bound)] Ratio<N>),
Ratio(
#[animation(field_bound)]
#[css(field_bound)]
#[distance(field_bound)]
Ratio<N>,
),
}
/// A generic value for the `aspect-ratio` property, the value is `auto || <ratio>`.
@ -188,7 +193,6 @@ pub enum PreferredRatio<N> {
MallocSizeOf,
PartialEq,
SpecifiedValueInfo,
ToAnimatedZero,
ToComputedValue,
ToCss,
ToResolvedValue,
@ -201,7 +205,9 @@ pub struct GenericAspectRatio<N> {
#[css(represents_keyword)]
pub auto: bool,
/// The preferred aspect-ratio value.
#[animation(field_bound)]
#[css(field_bound)]
#[distance(field_bound)]
pub ratio: PreferredRatio<N>,
}
@ -217,3 +223,10 @@ impl<N> AspectRatio<N> {
}
}
}
impl<N> ToAnimatedZero for AspectRatio<N> {
#[inline]
fn to_animated_zero(&self) -> Result<Self, ()> {
Err(())
}
}