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

Auto merge of #20255 - emilio:place-items, r=xidorn

Browse source 
style: Fix serialization of place-items.

If the justify-items / align-items value has the `legacy` bit or anything like
that we shouldn't serialize it, just as we don't parse it.

Bug: 1339656
Reviewed-by: xidorn
MozReview-Commit-ID: JsM4NrePEU6

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20255)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-09 09:49:57 -05:00 • committed by GitHub
commit 7ccc58e3ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/style/properties/shorthand/position.mako.rs
View file

@ -722,8 +722,10 @@
}
}
pub fn parse_value<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-> Result<Longhands, ParseError<'i>> {
pub fn parse_value<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Longhands, ParseError<'i>> {
let align = AlignItems::parse(context, input)?;
if align.has_extra_flags() {
return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError));
@ -742,13 +744,18 @@
impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result where W: fmt::Write {
if self.align_items.0 == self.justify_items.0 {
self.align_items.to_css(dest)
} else {
self.align_items.to_css(dest)?;
dest.write_str(" ")?;
self.justify_items.to_css(dest)
if self.align_items.has_extra_flags() ||
self.justify_items.has_extra_flags() {
return Ok(());
}
self.align_items.to_css(dest)?;
if self.align_items.0 != self.justify_items.0 {
dest.write_str(" ")?;
self.justify_items.to_css(dest)?;
}
Ok(())
}
}
</%helpers:shorthand>