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

style: Get rid of ComputedValueAsSpecified for alignment props.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-09-09 14:37:26 +02:00
parent 64ab73eabd
commit 4c283fbed6
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/values/computed/align.rs
View file

@ -8,7 +8,7 @@
use std::fmt; use std::fmt;
use style_traits::ToCss; use style_traits::ToCss;
use values::computed::{ComputedValueAsSpecified, Context, ToComputedValue}; use values::computed::{Context, ToComputedValue};
use values::specified; use values::specified;
pub use super::specified::{AlignItems, AlignJustifyContent, AlignJustifySelf}; pub use super::specified::{AlignItems, AlignJustifyContent, AlignJustifySelf};
@ -69,7 +69,3 @@ impl ToComputedValue for specified::JustifyItems {
computed.specified computed.specified
} }
} }
impl ComputedValueAsSpecified for AlignItems {}
impl ComputedValueAsSpecified for AlignJustifyContent {}
impl ComputedValueAsSpecified for AlignJustifySelf {}

1
components/style/values/computed/mod.rs
View file

@ -334,6 +334,7 @@ impl<T> ToComputedValue for T
trivial_to_computed_value!(Atom); trivial_to_computed_value!(Atom);
trivial_to_computed_value!(u8); trivial_to_computed_value!(u8);
trivial_to_computed_value!(u16);
trivial_to_computed_value!(bool); trivial_to_computed_value!(bool);
trivial_to_computed_value!(i32); trivial_to_computed_value!(i32);
trivial_to_computed_value!(f32); trivial_to_computed_value!(f32);

7
components/style/values/specified/align.rs
View file

@ -18,6 +18,7 @@ bitflags! {
/// Constants shared by multiple CSS Box Alignment properties /// Constants shared by multiple CSS Box Alignment properties
/// ///
/// These constants match Gecko's `NS_STYLE_ALIGN_*` constants. /// These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
#[derive(ToComputedValue)]
pub flags AlignFlags: u8 { pub flags AlignFlags: u8 {
// Enumeration stored in the lower 5 bits: // Enumeration stored in the lower 5 bits:
/// 'auto' /// 'auto'
@ -113,7 +114,7 @@ const ALIGN_ALL_SHIFT: u32 = structs::NS_STYLE_ALIGN_ALL_SHIFT;
/// ///
/// The 16-bit field stores the primary value in its lower 8 bits, and the optional fallback value /// The 16-bit field stores the primary value in its lower 8 bits, and the optional fallback value
/// in its upper 8 bits. This matches the representation of these properties in Gecko. /// in its upper 8 bits. This matches the representation of these properties in Gecko.
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq, ToComputedValue)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf, Deserialize, Serialize))] #[cfg_attr(feature = "servo", derive(HeapSizeOf, Deserialize, Serialize))]
pub struct AlignJustifyContent(u16); pub struct AlignJustifyContent(u16);
@ -205,7 +206,7 @@ impl Parse for AlignJustifyContent {
/// Value of the `align-self` or `justify-self` property. /// Value of the `align-self` or `justify-self` property.
/// ///
/// https://drafts.csswg.org/css-align/#self-alignment /// https://drafts.csswg.org/css-align/#self-alignment
#[derive(Clone, Copy, Debug, Eq, PartialEq, ToCss)] #[derive(Clone, Copy, Debug, Eq, PartialEq, ToComputedValue, ToCss)]
pub struct AlignJustifySelf(pub AlignFlags); pub struct AlignJustifySelf(pub AlignFlags);
impl AlignJustifySelf { impl AlignJustifySelf {
@ -242,7 +243,7 @@ impl Parse for AlignJustifySelf {
/// Value of the `align-items` property /// Value of the `align-items` property
/// ///
/// https://drafts.csswg.org/css-align/#self-alignment /// https://drafts.csswg.org/css-align/#self-alignment
#[derive(Clone, Copy, Debug, Eq, PartialEq, ToCss)] #[derive(Clone, Copy, Debug, Eq, PartialEq, ToComputedValue, ToCss)]
pub struct AlignItems(pub AlignFlags); pub struct AlignItems(pub AlignFlags);
impl AlignItems { impl AlignItems {