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

Correct serialization for border-radius property.

Browse source 
Closes #12655
This commit is contained in:
Pyfisch 2017-04-11 20:51:44 +02:00
parent f537fbd08f
commit 54e748bf4f
2 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/style/properties/shorthand/border.mako.rs
View file

@ -182,7 +182,7 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
'border-%s-radius' % (corner)
for corner in ['top-left', 'top-right', 'bottom-right', 'bottom-left']
)}" extra_prefixes="webkit" spec="https://drafts.csswg.org/css-backgrounds/#border-radius">
use values::specified::basic_shape::BorderRadius;
use values::specified::basic_shape::{BorderRadius, serialize_radius_values};
use parser::Parse;
pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
@ -195,21 +195,13 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
})
}
// TODO: I do not understand how border radius works with respect to the slashes /,
// so putting a default generic impl for now
// https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius
impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
try!(self.border_top_left_radius.to_css(dest));
try!(write!(dest, " "));
try!(self.border_top_right_radius.to_css(dest));
try!(write!(dest, " "));
try!(self.border_bottom_right_radius.to_css(dest));
try!(write!(dest, " "));
self.border_bottom_left_radius.to_css(dest)
serialize_radius_values(dest,
&self.border_top_left_radius.0,
&self.border_top_right_radius.0,
&self.border_bottom_right_radius.0,
&self.border_bottom_left_radius.0)
}
}
</%helpers:shorthand>

23
tests/unit/style/properties/serialization.rs
View file

@ -368,6 +368,29 @@ mod shorthand_serialization {
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "border-style: solid dotted;");
}
use style::values::specified::BorderRadiusSize;
use style::values::specified::length::Percentage;
#[test]
fn border_radius_should_serialize_correctly() {
let mut properties = Vec::new();
properties.push(PropertyDeclaration::BorderTopLeftRadius(Box::new(BorderRadiusSize::new(
Percentage(0.01).into(), Percentage(0.05).into()
))));
properties.push(PropertyDeclaration::BorderTopRightRadius(Box::new(BorderRadiusSize::new(
Percentage(0.02).into(), Percentage(0.06).into()
))));
properties.push(PropertyDeclaration::BorderBottomRightRadius(Box::new(BorderRadiusSize::new(
Percentage(0.03).into(), Percentage(0.07).into()
))));
properties.push(PropertyDeclaration::BorderBottomLeftRadius(Box::new(BorderRadiusSize::new(
Percentage(0.04).into(), Percentage(0.08).into()
))));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "border-radius: 1% 2% 3% 4% / 5% 6% 7% 8%;");
}
}