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

make -webkit-text-stroke color and width shorthand no longer sensitive to order of values

Browse source
This commit is contained in:
Dexter Haslem 2017-01-24 00:01:44 -07:00
parent 231481570e
commit f3bcb0a496
2 changed files with 46 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/style/properties/shorthand/inherited_text.mako.rs
View file

@ -76,25 +76,34 @@
use values::specified::{BorderWidth, Length};
use app_units::Au;
let (mut color, mut width, mut any) = (None, None, false);
% for value in "color width".split():
if ${value}.is_none() {
if let Ok(value) = input.try(|input| _webkit_text_stroke_${value}::parse(context, input)) {
${value} = Some(value);
any = true;
let mut color = None;
let mut width = None;
loop {
if color.is_none() {
if let Ok(value) = input.try(|input| _webkit_text_stroke_color::parse(context, input)) {
color = Some(value);
continue
}
}
% endfor
if !any {
return Err(());
if width.is_none() {
if let Ok(value) = input.try(|input| _webkit_text_stroke_width::parse(context, input)) {
width = Some(value);
continue
}
}
break
}
Ok(Longhands {
_webkit_text_stroke_color: color.or(Some(CSSColor { parsed: CSSParserColor::CurrentColor,
authored: None })),
_webkit_text_stroke_width: width.or(Some(BorderWidth::from_length(Length::Absolute(Au::from_px(0))))),
})
if color.is_some() || width.is_some() {
Ok(Longhands {
_webkit_text_stroke_color: color.or(Some(CSSColor { parsed: CSSParserColor::CurrentColor,
authored: None })),
_webkit_text_stroke_width: width.or(Some(BorderWidth::from_length(Length::Absolute(Au::from_px(0))))),
})
} else {
Err(())
}
}
impl<'a> LonghandsToSerialize<'a> {

23
tests/unit/style/parsing/inherited_text.rs
View file

@ -78,3 +78,26 @@ fn test_text_emphasis_position() {
let left_under = parse_longhand!(text_emphasis_position, "left under");
assert_eq!(left_under, SpecifiedValue(HorizontalWritingModeValue::Under, VerticalWritingModeValue::Left));
}
#[test]
fn webkit_text_stroke_shorthand_should_parse_properly() {
use style::properties::longhands::_webkit_text_stroke_color;
use style::properties::longhands::_webkit_text_stroke_width;
use style::properties::shorthands::_webkit_text_stroke;
use media_queries::CSSErrorReporterTest;
use servo_url::ServoUrl;
let url = ServoUrl::parse("http://localhost").unwrap();
let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
let mut parser = Parser::new("thin red");
let result = _webkit_text_stroke::parse_value(&context, &mut parser).unwrap();
assert_eq!(result._webkit_text_stroke_color.unwrap(), parse_longhand!(_webkit_text_stroke_color, "red"));
assert_eq!(result._webkit_text_stroke_width.unwrap(), parse_longhand!(_webkit_text_stroke_width, "thin"));
// ensure its no longer sensitive to order
let mut parser = Parser::new("red thin");
let result = _webkit_text_stroke::parse_value(&context, &mut parser).unwrap();
assert_eq!(result._webkit_text_stroke_color.unwrap(), parse_longhand!(_webkit_text_stroke_color, "red"));
assert_eq!(result._webkit_text_stroke_width.unwrap(), parse_longhand!(_webkit_text_stroke_width, "thin"));
}