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

style: Properly fail to serialize grid shorthand when not roundtripping

Browse source 
Other browsers also don't roundtrip properly, but they fail less
severely.

Differential Revision: https://phabricator.services.mozilla.com/D152794
This commit is contained in:
Emilio Cobos Álvarez 2022-07-26 22:43:26 +00:00 • committed by Martin Robinson
parent 59da4326fd
commit f1e04f76f0
1 changed files with 39 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

71
components/style/properties/shorthands/position.mako.rs
View file

@ -621,7 +621,6 @@
impl<'a> LonghandsToSerialize<'a> { impl<'a> LonghandsToSerialize<'a> {
/// Returns true if other sub properties except template-{rows,columns} are initial. /// Returns true if other sub properties except template-{rows,columns} are initial.
fn is_grid_template(&self) -> bool { fn is_grid_template(&self) -> bool {
*self.grid_template_areas == GridTemplateAreas::None &&
self.grid_auto_rows.is_initial() && self.grid_auto_rows.is_initial() &&
self.grid_auto_columns.is_initial() && self.grid_auto_columns.is_initial() &&
*self.grid_auto_flow == grid_auto_flow::get_initial_value() *self.grid_auto_flow == grid_auto_flow::get_initial_value()
@ -630,13 +629,19 @@
impl<'a> ToCss for LonghandsToSerialize<'a> { impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result where W: fmt::Write {
if *self.grid_template_areas != GridTemplateAreas::None || if self.is_grid_template() {
(!self.grid_template_rows.is_initial() && return super::grid_template::serialize_grid_template(
!self.grid_template_columns.is_initial()) || self.grid_template_rows,
self.is_grid_template() { self.grid_template_columns,
return super::grid_template::serialize_grid_template(self.grid_template_rows, self.grid_template_areas,
self.grid_template_columns, dest
self.grid_template_areas, dest); );
}
if *self.grid_template_areas != GridTemplateAreas::None {
// No other syntax can set the template areas, so fail to
// serialize.
return Ok(());
} }
if self.grid_auto_flow.contains(GridAutoFlow::COLUMN) { if self.grid_auto_flow.contains(GridAutoFlow::COLUMN) {
@ -663,33 +668,35 @@
dest.write_str(" ")?; dest.write_str(" ")?;
self.grid_auto_columns.to_css(dest)?; self.grid_auto_columns.to_css(dest)?;
} }
} else {
// It should fail to serialize if other branch of the if condition's values are set. return Ok(());
if !self.grid_auto_columns.is_initial() || }
!self.grid_template_rows.is_initial() {
// It should fail to serialize if other branch of the if condition's values are set.
if !self.grid_auto_columns.is_initial() ||
!self.grid_template_rows.is_initial() {
return Ok(());
}
// It should fail to serialize if template-column value is not Explicit.
if let GenericGridTemplateComponent::TrackList(ref list) = *self.grid_template_columns {
if !list.is_explicit() {
return Ok(()); return Ok(());
} }
// It should fail to serialize if template-column value is not Explicit.
if let GenericGridTemplateComponent::TrackList(ref list) = *self.grid_template_columns {
if !list.is_explicit() {
return Ok(());
}
}
dest.write_str("auto-flow")?;
if self.grid_auto_flow.contains(GridAutoFlow::DENSE) {
dest.write_str(" dense")?;
}
if !self.grid_auto_rows.is_initial() {
dest.write_str(" ")?;
self.grid_auto_rows.to_css(dest)?;
}
dest.write_str(" / ")?;
self.grid_template_columns.to_css(dest)?;
} }
dest.write_str("auto-flow")?;
if self.grid_auto_flow.contains(GridAutoFlow::DENSE) {
dest.write_str(" dense")?;
}
if !self.grid_auto_rows.is_initial() {
dest.write_str(" ")?;
self.grid_auto_rows.to_css(dest)?;
}
dest.write_str(" / ")?;
self.grid_template_columns.to_css(dest)?;
Ok(()) Ok(())
} }
} }