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

Rename BorderImageWidthSide to BorderImageSideWidth

Browse source
This commit is contained in:
Anthony Ramine 2017-06-01 11:06:51 +02:00
parent 7da94d0880
commit e58f541951
7 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/properties/gecko.mako.rs
View file

@ -998,17 +998,17 @@ fn static_assert() {
} }
pub fn set_border_image_width(&mut self, v: longhands::border_image_width::computed_value::T) { pub fn set_border_image_width(&mut self, v: longhands::border_image_width::computed_value::T) {
use values::generics::border::BorderImageWidthSide; use values::generics::border::BorderImageSideWidth;
% for side in SIDES: % for side in SIDES:
match v.${side.index} { match v.${side.index} {
BorderImageWidthSide::Auto => { BorderImageSideWidth::Auto => {
self.gecko.mBorderImageWidth.data_at_mut(${side.index}).set_value(CoordDataValue::Auto) self.gecko.mBorderImageWidth.data_at_mut(${side.index}).set_value(CoordDataValue::Auto)
}, },
BorderImageWidthSide::Length(l) => { BorderImageSideWidth::Length(l) => {
l.to_gecko_style_coord(&mut self.gecko.mBorderImageWidth.data_at_mut(${side.index})) l.to_gecko_style_coord(&mut self.gecko.mBorderImageWidth.data_at_mut(${side.index}))
}, },
BorderImageWidthSide::Number(n) => { BorderImageSideWidth::Number(n) => {
self.gecko.mBorderImageWidth.data_at_mut(${side.index}).set_value(CoordDataValue::Factor(n)) self.gecko.mBorderImageWidth.data_at_mut(${side.index}).set_value(CoordDataValue::Factor(n))
}, },
} }

4
components/style/properties/longhand/border.mako.rs
View file

@ -289,8 +289,8 @@ ${helpers.predefined_type("border-image-outset", "LengthOrNumberRect",
</%helpers:longhand> </%helpers:longhand>
${helpers.predefined_type("border-image-width", "BorderImageWidth", ${helpers.predefined_type("border-image-width", "BorderImageWidth",
initial_value="computed::BorderImageWidthSide::one().into()", initial_value="computed::BorderImageSideWidth::one().into()",
initial_specified_value="specified::BorderImageWidthSide::one().into()", initial_specified_value="specified::BorderImageSideWidth::one().into()",
spec="https://drafts.csswg.org/css-backgrounds/#border-image-width", spec="https://drafts.csswg.org/css-backgrounds/#border-image-width",
animation_value_type="none", animation_value_type="none",
boxed=True)} boxed=True)}

10
components/style/values/computed/border.rs
View file

@ -7,16 +7,16 @@
use values::computed::{Number, NumberOrPercentage}; use values::computed::{Number, NumberOrPercentage};
use values::computed::length::LengthOrPercentage; use values::computed::length::LengthOrPercentage;
use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius; use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius;
use values::generics::border::BorderImageSideWidth as GenericBorderImageSideWidth;
use values::generics::border::BorderImageSlice as GenericBorderImageSlice; use values::generics::border::BorderImageSlice as GenericBorderImageSlice;
use values::generics::border::BorderImageWidthSide as GenericBorderImageWidthSide;
use values::generics::border::BorderRadius as GenericBorderRadius; use values::generics::border::BorderRadius as GenericBorderRadius;
use values::generics::rect::Rect; use values::generics::rect::Rect;
/// A computed value for the `border-image-width` property. /// A computed value for the `border-image-width` property.
pub type BorderImageWidth = Rect<BorderImageWidthSide>; pub type BorderImageWidth = Rect<BorderImageSideWidth>;
/// A computed value for a single side of a `border-image-width` property. /// A computed value for a single side of a `border-image-width` property.
pub type BorderImageWidthSide = GenericBorderImageWidthSide<LengthOrPercentage, Number>; pub type BorderImageSideWidth = GenericBorderImageSideWidth<LengthOrPercentage, Number>;
/// A computed value for the `border-image-slice` property. /// A computed value for the `border-image-slice` property.
pub type BorderImageSlice = GenericBorderImageSlice<NumberOrPercentage>; pub type BorderImageSlice = GenericBorderImageSlice<NumberOrPercentage>;
@ -27,10 +27,10 @@ pub type BorderRadius = GenericBorderRadius<LengthOrPercentage>;
/// A computed value for the `border-*-radius` longhand properties. /// A computed value for the `border-*-radius` longhand properties.
pub type BorderCornerRadius = GenericBorderCornerRadius<LengthOrPercentage>; pub type BorderCornerRadius = GenericBorderCornerRadius<LengthOrPercentage>;
impl BorderImageWidthSide { impl BorderImageSideWidth {
/// Returns `1`. /// Returns `1`.
#[inline] #[inline]
pub fn one() -> Self { pub fn one() -> Self {
GenericBorderImageWidthSide::Number(1.) GenericBorderImageSideWidth::Number(1.)
} }
} }

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

@ -24,7 +24,7 @@ use super::specified;
pub use app_units::Au; pub use app_units::Au;
pub use cssparser::Color as CSSColor; pub use cssparser::Color as CSSColor;
pub use self::background::BackgroundSize; pub use self::background::BackgroundSize;
pub use self::border::{BorderImageSlice, BorderImageWidth, BorderImageWidthSide}; pub use self::border::{BorderImageSlice, BorderImageWidth, BorderImageSideWidth};
pub use self::border::{BorderRadius, BorderCornerRadius}; pub use self::border::{BorderRadius, BorderCornerRadius};
pub use self::image::{Gradient, GradientItem, ImageLayer, LineDirection, Image, ImageRect}; pub use self::image::{Gradient, GradientItem, ImageLayer, LineDirection, Image, ImageRect};
pub use self::rect::LengthOrNumberRect; pub use self::rect::LengthOrNumberRect;

10
components/style/values/generics/border.rs
View file

@ -12,7 +12,7 @@ use values::generics::rect::Rect;
/// A generic value for a single side of a `border-image-width` property. /// A generic value for a single side of a `border-image-width` property.
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq, ToComputedValue)] #[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq, ToComputedValue)]
pub enum BorderImageWidthSide<LengthOrPercentage, Number> { pub enum BorderImageSideWidth<LengthOrPercentage, Number> {
/// `<length-or-percentage>` /// `<length-or-percentage>`
Length(LengthOrPercentage), Length(LengthOrPercentage),
/// `<number>` /// `<number>`
@ -52,16 +52,16 @@ pub struct BorderRadius<LengthOrPercentage> {
/// A generic value for `border-*-radius` longhand properties. /// A generic value for `border-*-radius` longhand properties.
pub struct BorderCornerRadius<L>(pub Size2D<L>); pub struct BorderCornerRadius<L>(pub Size2D<L>);
impl<L, N> ToCss for BorderImageWidthSide<L, N> impl<L, N> ToCss for BorderImageSideWidth<L, N>
where L: ToCss, N: ToCss, where L: ToCss, N: ToCss,
{ {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result fn to_css<W>(&self, dest: &mut W) -> fmt::Result
where W: fmt::Write where W: fmt::Write
{ {
match *self { match *self {
BorderImageWidthSide::Length(ref length) => length.to_css(dest), BorderImageSideWidth::Length(ref length) => length.to_css(dest),
BorderImageWidthSide::Number(ref number) => number.to_css(dest), BorderImageSideWidth::Number(ref number) => number.to_css(dest),
BorderImageWidthSide::Auto => dest.write_str("auto"), BorderImageSideWidth::Auto => dest.write_str("auto"),
} }
} }
} }

18
components/style/values/specified/border.rs
View file

@ -11,8 +11,8 @@ use std::fmt;
use style_traits::ToCss; use style_traits::ToCss;
use values::computed::{Context, ToComputedValue}; use values::computed::{Context, ToComputedValue};
use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius; use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius;
use values::generics::border::BorderImageSideWidth as GenericBorderImageSideWidth;
use values::generics::border::BorderImageSlice as GenericBorderImageSlice; use values::generics::border::BorderImageSlice as GenericBorderImageSlice;
use values::generics::border::BorderImageWidthSide as GenericBorderImageWidthSide;
use values::generics::border::BorderRadius as GenericBorderRadius; use values::generics::border::BorderRadius as GenericBorderRadius;
use values::generics::rect::Rect; use values::generics::rect::Rect;
use values::specified::{AllowQuirks, Number, NumberOrPercentage}; use values::specified::{AllowQuirks, Number, NumberOrPercentage};
@ -33,10 +33,10 @@ pub enum BorderSideWidth {
} }
/// A specified value for the `border-image-width` property. /// A specified value for the `border-image-width` property.
pub type BorderImageWidth = Rect<BorderImageWidthSide>; pub type BorderImageWidth = Rect<BorderImageSideWidth>;
/// A specified value for a single side of a `border-image-width` property. /// A specified value for a single side of a `border-image-width` property.
pub type BorderImageWidthSide = GenericBorderImageWidthSide<LengthOrPercentage, Number>; pub type BorderImageSideWidth = GenericBorderImageSideWidth<LengthOrPercentage, Number>;
/// A specified value for the `border-image-slice` property. /// A specified value for the `border-image-slice` property.
pub type BorderImageSlice = GenericBorderImageSlice<NumberOrPercentage>; pub type BorderImageSlice = GenericBorderImageSlice<NumberOrPercentage>;
@ -106,26 +106,26 @@ impl ToComputedValue for BorderSideWidth {
} }
} }
impl BorderImageWidthSide { impl BorderImageSideWidth {
/// Returns `1`. /// Returns `1`.
#[inline] #[inline]
pub fn one() -> Self { pub fn one() -> Self {
GenericBorderImageWidthSide::Number(Number::new(1.)) GenericBorderImageSideWidth::Number(Number::new(1.))
} }
} }
impl Parse for BorderImageWidthSide { impl Parse for BorderImageSideWidth {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
if input.try(|i| i.expect_ident_matching("auto")).is_ok() { if input.try(|i| i.expect_ident_matching("auto")).is_ok() {
return Ok(GenericBorderImageWidthSide::Auto); return Ok(GenericBorderImageSideWidth::Auto);
} }
if let Ok(len) = input.try(|i| LengthOrPercentage::parse_non_negative(context, i)) { if let Ok(len) = input.try(|i| LengthOrPercentage::parse_non_negative(context, i)) {
return Ok(GenericBorderImageWidthSide::Length(len)); return Ok(GenericBorderImageSideWidth::Length(len));
} }
let num = Number::parse_non_negative(context, input)?; let num = Number::parse_non_negative(context, input)?;
Ok(GenericBorderImageWidthSide::Number(num)) Ok(GenericBorderImageSideWidth::Number(num))
} }
} }

2
components/style/values/specified/mod.rs
View file

@ -31,7 +31,7 @@ use values::specified::calc::CalcNode;
pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems}; pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems};
pub use self::background::BackgroundSize; pub use self::background::BackgroundSize;
pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth}; pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth};
pub use self::border::{BorderImageWidthSide, BorderRadius, BorderSideWidth}; pub use self::border::{BorderImageSideWidth, BorderRadius, BorderSideWidth};
pub use self::color::Color; pub use self::color::Color;
pub use self::rect::LengthOrNumberRect; pub use self::rect::LengthOrNumberRect;
pub use super::generics::grid::GridLine; pub use super::generics::grid::GridLine;