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

Fixed #15200 - added missing comma in {background,mask}-position

Browse source 
serialization
This commit is contained in:
Kuba Pawlaczyk 2017-03-28 21:38:42 +02:00
parent 0ebb9ec9e8
commit fbdee15c53
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/properties/shorthand/background.mako.rs
View file

@ -234,6 +234,9 @@
self.background_position_x.0[i].to_css(dest)?; self.background_position_x.0[i].to_css(dest)?;
dest.write_str(" ")?; dest.write_str(" ")?;
self.background_position_y.0[i].to_css(dest)?; self.background_position_y.0[i].to_css(dest)?;
if i < len - 1 {
dest.write_str(", ")?;
}
} }
Ok(()) Ok(())
} }

4
components/style/properties/shorthand/mask.mako.rs
View file

@ -226,7 +226,11 @@
for i in 0..len { for i in 0..len {
self.mask_position_x.0[i].to_css(dest)?; self.mask_position_x.0[i].to_css(dest)?;
dest.write_str(" ")?;
self.mask_position_y.0[i].to_css(dest)?; self.mask_position_y.0[i].to_css(dest)?;
if i < len - 1 {
dest.write_str(", ")?;
}
} }
Ok(()) Ok(())

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

@ -741,14 +741,14 @@ mod shorthand_serialization {
// https://github.com/servo/servo/issues/15398 ) // https://github.com/servo/servo/issues/15398 )
// With background, the color is one exception as it should only appear once for // With background, the color is one exception as it should only appear once for
// multiple backgrounds. // multiple backgrounds.
// Below, background-position and background-origin only have one value. // Below background-origin only has one value.
let block_text = "\ let block_text = "\
background-color: rgb(0, 0, 255); \ background-color: rgb(0, 0, 255); \
background-image: url(\"http://servo/test.png\"), none; \ background-image: url(\"http://servo/test.png\"), none; \
background-repeat: repeat-x, repeat-y; \ background-repeat: repeat-x, repeat-y; \
background-attachment: scroll, scroll; \ background-attachment: scroll, scroll; \
background-size: 70px 50px, 20px 30px; \ background-size: 70px 50px, 20px 30px; \
background-position: 7px 4px; \ background-position: 7px 4px, 5px 6px; \
background-origin: border-box; \ background-origin: border-box; \
background-clip: padding-box, padding-box;"; background-clip: padding-box, padding-box;";
let block = parse_declaration_block(block_text); let block = parse_declaration_block(block_text);
@ -905,6 +905,14 @@ mod shorthand_serialization {
repeat-x padding-box subtract;" repeat-x padding-box subtract;"
); );
} }
#[test]
fn serialize_mask_position_with_multiple_values() {
let block_text = "mask-position: 1px 2px, 4px 3px;";
let block = parse_declaration_block(block_text);
let serialization = block.to_css_string();
assert_eq!(serialization, block_text);
}
} }
mod scroll_snap_type { mod scroll_snap_type {