mirror of
https://github.com/servo/servo.git
synced 2025-08-11 16:35:33 +01:00
Use generics for the border-image-width property
This commit is contained in:
Anthony Ramine
parent
7a214831f0
commit
c8eb277ca5
8 changed files with 115 additions and 189 deletions
|
|
@ -993,17 +993,17 @@ fn static_assert() {
|
|||
}
|
||||
|
||||
pub fn set_border_image_width(&mut self, v: longhands::border_image_width::computed_value::T) {
|
||||
use properties::longhands::border_image_width::computed_value::SingleComputedValue;
|
||||
use values::generics::border::BorderImageWidthSide;
|
||||
|
||||
% for side in SIDES:
|
||||
match v.${side.index} {
|
||||
SingleComputedValue::Auto => {
|
||||
match v.${side.ident} {
|
||||
BorderImageWidthSide::Auto => {
|
||||
self.gecko.mBorderImageWidth.data_at_mut(${side.index}).set_value(CoordDataValue::Auto)
|
||||
},
|
||||
SingleComputedValue::LengthOrPercentage(l) => {
|
||||
BorderImageWidthSide::Length(l) => {
|
||||
l.to_gecko_style_coord(&mut self.gecko.mBorderImageWidth.data_at_mut(${side.index}))
|
||||
},
|
||||
SingleComputedValue::Number(n) => {
|
||||
BorderImageWidthSide::Number(n) => {
|
||||
self.gecko.mBorderImageWidth.data_at_mut(${side.index}).set_value(CoordDataValue::Factor(n))
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -284,190 +284,12 @@ ${helpers.predefined_type("border-image-outset", "LengthOrNumberRect",
|
|||
}
|
||||
</%helpers:longhand>
|
||||
|
||||
<%helpers:longhand name="border-image-width" animation_value_type="none"
|
||||
spec="https://drafts.csswg.org/css-backgrounds/#border-image-width">
|
||||
use std::fmt;
|
||||
use style_traits::ToCss;
|
||||
use values::specified::{LengthOrPercentage, Number};
|
||||
|
||||
pub mod computed_value {
|
||||
use values::computed::{LengthOrPercentage, Number};
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||
pub struct T(pub SingleComputedValue, pub SingleComputedValue,
|
||||
pub SingleComputedValue, pub SingleComputedValue);
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||
pub enum SingleComputedValue {
|
||||
LengthOrPercentage(LengthOrPercentage),
|
||||
Number(Number),
|
||||
Auto,
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
|
||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||
pub struct SpecifiedValue(pub Vec<SingleSpecifiedValue>);
|
||||
|
||||
impl ToCss for computed_value::T {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.0.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
try!(self.1.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
try!(self.2.to_css(dest));
|
||||
try!(dest.write_str(" "));
|
||||
self.3.to_css(dest)
|
||||
}
|
||||
}
|
||||
impl ToCss for SpecifiedValue {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
try!(self.0[0].to_css(dest));
|
||||
for value in self.0.iter().skip(1) {
|
||||
try!(dest.write_str(" "));
|
||||
try!(value.to_css(dest));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
|
||||
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
|
||||
pub enum SingleSpecifiedValue {
|
||||
LengthOrPercentage(LengthOrPercentage),
|
||||
Number(Number),
|
||||
Auto,
|
||||
}
|
||||
|
||||
impl ToCss for computed_value::SingleComputedValue {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self {
|
||||
computed_value::SingleComputedValue::LengthOrPercentage(ref len) => len.to_css(dest),
|
||||
computed_value::SingleComputedValue::Number(number) => number.to_css(dest),
|
||||
computed_value::SingleComputedValue::Auto => dest.write_str("auto"),
|
||||
}
|
||||
}
|
||||
}
|
||||
impl ToCss for SingleSpecifiedValue {
|
||||
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
|
||||
match *self {
|
||||
SingleSpecifiedValue::LengthOrPercentage(ref len) => len.to_css(dest),
|
||||
SingleSpecifiedValue::Number(number) => number.to_css(dest),
|
||||
SingleSpecifiedValue::Auto => dest.write_str("auto"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ToComputedValue for SingleSpecifiedValue {
|
||||
type ComputedValue = computed_value::SingleComputedValue;
|
||||
|
||||
#[inline]
|
||||
fn to_computed_value(&self, context: &Context) -> computed_value::SingleComputedValue {
|
||||
match *self {
|
||||
SingleSpecifiedValue::LengthOrPercentage(ref len) => {
|
||||
computed_value::SingleComputedValue::LengthOrPercentage(
|
||||
len.to_computed_value(context))
|
||||
},
|
||||
SingleSpecifiedValue::Number(number) =>
|
||||
computed_value::SingleComputedValue::Number(number.to_computed_value(context)),
|
||||
SingleSpecifiedValue::Auto => computed_value::SingleComputedValue::Auto,
|
||||
}
|
||||
}
|
||||
#[inline]
|
||||
fn from_computed_value(computed: &computed_value::SingleComputedValue) -> Self {
|
||||
match *computed {
|
||||
computed_value::SingleComputedValue::LengthOrPercentage(len) => {
|
||||
SingleSpecifiedValue::LengthOrPercentage(
|
||||
ToComputedValue::from_computed_value(&len))
|
||||
},
|
||||
computed_value::SingleComputedValue::Number(number) =>
|
||||
SingleSpecifiedValue::Number(ToComputedValue::from_computed_value(&number)),
|
||||
computed_value::SingleComputedValue::Auto => SingleSpecifiedValue::Auto,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn get_initial_value() -> computed_value::T {
|
||||
computed_value::T(computed_value::SingleComputedValue::Number(1.0),
|
||||
computed_value::SingleComputedValue::Number(1.0),
|
||||
computed_value::SingleComputedValue::Number(1.0),
|
||||
computed_value::SingleComputedValue::Number(1.0))
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn get_initial_specified_value() -> SpecifiedValue {
|
||||
SpecifiedValue(vec![SingleSpecifiedValue::Number(Number::new(1.0))])
|
||||
}
|
||||
|
||||
impl ToComputedValue for SpecifiedValue {
|
||||
type ComputedValue = computed_value::T;
|
||||
|
||||
#[inline]
|
||||
fn to_computed_value(&self, context: &Context) -> computed_value::T {
|
||||
let length = self.0.len();
|
||||
match length {
|
||||
4 => computed_value::T(self.0[0].to_computed_value(context),
|
||||
self.0[1].to_computed_value(context),
|
||||
self.0[2].to_computed_value(context),
|
||||
self.0[3].to_computed_value(context)),
|
||||
3 => computed_value::T(self.0[0].to_computed_value(context),
|
||||
self.0[1].to_computed_value(context),
|
||||
self.0[2].to_computed_value(context),
|
||||
self.0[1].to_computed_value(context)),
|
||||
2 => computed_value::T(self.0[0].to_computed_value(context),
|
||||
self.0[1].to_computed_value(context),
|
||||
self.0[0].to_computed_value(context),
|
||||
self.0[1].to_computed_value(context)),
|
||||
1 => computed_value::T(self.0[0].to_computed_value(context),
|
||||
self.0[0].to_computed_value(context),
|
||||
self.0[0].to_computed_value(context),
|
||||
self.0[0].to_computed_value(context)),
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
#[inline]
|
||||
fn from_computed_value(computed: &computed_value::T) -> Self {
|
||||
SpecifiedValue(vec![ToComputedValue::from_computed_value(&computed.0),
|
||||
ToComputedValue::from_computed_value(&computed.1),
|
||||
ToComputedValue::from_computed_value(&computed.2),
|
||||
ToComputedValue::from_computed_value(&computed.3)])
|
||||
}
|
||||
}
|
||||
|
||||
impl Parse for SingleSpecifiedValue {
|
||||
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
|
||||
if input.try(|input| input.expect_ident_matching("auto")).is_ok() {
|
||||
return Ok(SingleSpecifiedValue::Auto);
|
||||
}
|
||||
|
||||
if let Ok(len) = input.try(|input| LengthOrPercentage::parse_non_negative(context, input)) {
|
||||
return Ok(SingleSpecifiedValue::LengthOrPercentage(len));
|
||||
}
|
||||
|
||||
let num = try!(Number::parse_non_negative(context, input));
|
||||
Ok(SingleSpecifiedValue::Number(num))
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
|
||||
let mut values = vec![];
|
||||
for _ in 0..4 {
|
||||
let value = input.try(|input| SingleSpecifiedValue::parse(context, input));
|
||||
match value {
|
||||
Ok(val) => values.push(val),
|
||||
Err(_) => break,
|
||||
}
|
||||
}
|
||||
|
||||
if values.len() > 0 {
|
||||
Ok(SpecifiedValue(values))
|
||||
} else {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
</%helpers:longhand>
|
||||
${helpers.predefined_type("border-image-width", "BorderImageWidth",
|
||||
initial_value="computed::BorderImageWidthSide::one().into()",
|
||||
initial_specified_value="specified::BorderImageWidthSide::one().into()",
|
||||
spec="https://drafts.csswg.org/css-backgrounds/#border-image-width",
|
||||
animation_value_type="none",
|
||||
boxed=True)}
|
||||
|
||||
<%helpers:longhand name="border-image-slice" boxed="True" animation_value_type="none"
|
||||
spec="https://drafts.csswg.org/css-backgrounds/#border-image-slice">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue