mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Backed out changeset d186bcce1235 for failing on layout/style/test/test_shorthand_property_getters.html on a CLOSED TREE
This commit is contained in:
parent
d23526ec95
commit
50cb7a4f32
@ -5,8 +5,10 @@
|
||||
//! Computed types for CSS values related to borders.
|
||||
|
||||
use app_units::Au;
|
||||
use std::fmt::{self, Write};
|
||||
use style_traits::{ToCss, CssWriter};
|
||||
use values::animated::ToAnimatedZero;
|
||||
use values::computed::{Number, NumberOrPercentage};
|
||||
use values::computed::{Context, Number, NumberOrPercentage, ToComputedValue};
|
||||
use values::computed::length::{LengthOrPercentage, NonNegativeLength};
|
||||
use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius;
|
||||
use values::generics::border::BorderImageSideWidth as GenericBorderImageSideWidth;
|
||||
@ -15,8 +17,7 @@ use values::generics::border::BorderRadius as GenericBorderRadius;
|
||||
use values::generics::border::BorderSpacing as GenericBorderSpacing;
|
||||
use values::generics::rect::Rect;
|
||||
use values::generics::size::Size;
|
||||
|
||||
pub use values::specified::border::BorderImageRepeat;
|
||||
use values::specified::border::{BorderImageRepeat as SpecifiedBorderImageRepeat, BorderImageRepeatKeyword};
|
||||
|
||||
/// A computed value for the `border-image-width` property.
|
||||
pub type BorderImageWidth = Rect<BorderImageSideWidth>;
|
||||
@ -75,3 +76,44 @@ impl ToAnimatedZero for BorderCornerRadius {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
||||
/// The computed value of the `border-image-repeat` property:
|
||||
///
|
||||
/// https://drafts.csswg.org/css-backgrounds/#the-border-image-repeat
|
||||
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq)]
|
||||
pub struct BorderImageRepeat(pub BorderImageRepeatKeyword, pub BorderImageRepeatKeyword);
|
||||
|
||||
impl BorderImageRepeat {
|
||||
/// Returns the `stretch` value.
|
||||
pub fn stretch() -> Self {
|
||||
BorderImageRepeat(BorderImageRepeatKeyword::Stretch, BorderImageRepeatKeyword::Stretch)
|
||||
}
|
||||
}
|
||||
|
||||
impl ToCss for BorderImageRepeat {
|
||||
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
|
||||
where
|
||||
W: Write,
|
||||
{
|
||||
self.0.to_css(dest)?;
|
||||
if self.0 != self.1 {
|
||||
dest.write_str(" ")?;
|
||||
self.1.to_css(dest)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl ToComputedValue for SpecifiedBorderImageRepeat {
|
||||
type ComputedValue = BorderImageRepeat;
|
||||
|
||||
#[inline]
|
||||
fn to_computed_value(&self, _: &Context) -> Self::ComputedValue {
|
||||
BorderImageRepeat(self.0, self.1.unwrap_or(self.0))
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn from_computed_value(computed: &Self::ComputedValue) -> Self {
|
||||
SpecifiedBorderImageRepeat(computed.0, Some(computed.1))
|
||||
}
|
||||
}
|
||||
|
@ -6,8 +6,7 @@
|
||||
|
||||
use cssparser::Parser;
|
||||
use parser::{Parse, ParserContext};
|
||||
use std::fmt::{self, Write};
|
||||
use style_traits::{CssWriter, ParseError, ToCss};
|
||||
use style_traits::ParseError;
|
||||
use values::computed::{self, Context, ToComputedValue};
|
||||
use values::generics::border::BorderCornerRadius as GenericBorderCornerRadius;
|
||||
use values::generics::border::BorderImageSideWidth as GenericBorderImageSideWidth;
|
||||
@ -55,8 +54,9 @@ impl BorderSideWidth {
|
||||
pub fn parse_quirky<'i, 't>(
|
||||
context: &ParserContext,
|
||||
input: &mut Parser<'i, 't>,
|
||||
allow_quirks: AllowQuirks,
|
||||
) -> Result<Self, ParseError<'i>> {
|
||||
allow_quirks: AllowQuirks)
|
||||
-> Result<Self, ParseError<'i>>
|
||||
{
|
||||
if let Ok(length) = input.try(|i| Length::parse_non_negative_quirky(context, i, allow_quirks)) {
|
||||
return Ok(BorderSideWidth::Length(length));
|
||||
}
|
||||
@ -186,31 +186,14 @@ pub enum BorderImageRepeatKeyword {
|
||||
/// The specified value for the `border-image-repeat` property.
|
||||
///
|
||||
/// https://drafts.csswg.org/css-backgrounds/#the-border-image-repeat
|
||||
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToComputedValue)]
|
||||
pub struct BorderImageRepeat(pub BorderImageRepeatKeyword, pub BorderImageRepeatKeyword);
|
||||
|
||||
impl ToCss for BorderImageRepeat {
|
||||
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
|
||||
where
|
||||
W: Write,
|
||||
{
|
||||
self.0.to_css(dest)?;
|
||||
if self.0 != self.1 {
|
||||
dest.write_str(" ")?;
|
||||
self.1.to_css(dest)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToCss)]
|
||||
pub struct BorderImageRepeat(pub BorderImageRepeatKeyword, pub Option<BorderImageRepeatKeyword>);
|
||||
|
||||
impl BorderImageRepeat {
|
||||
/// Returns the `stretch` value.
|
||||
#[inline]
|
||||
pub fn stretch() -> Self {
|
||||
BorderImageRepeat(
|
||||
BorderImageRepeatKeyword::Stretch,
|
||||
BorderImageRepeatKeyword::Stretch,
|
||||
)
|
||||
BorderImageRepeat(BorderImageRepeatKeyword::Stretch, None)
|
||||
}
|
||||
}
|
||||
|
||||
@ -221,6 +204,6 @@ impl Parse for BorderImageRepeat {
|
||||
) -> Result<Self, ParseError<'i>> {
|
||||
let horizontal = BorderImageRepeatKeyword::parse(input)?;
|
||||
let vertical = input.try(BorderImageRepeatKeyword::parse).ok();
|
||||
Ok(BorderImageRepeat(horizontal, vertical.unwrap_or(horizontal)))
|
||||
Ok(BorderImageRepeat(horizontal, vertical))
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user