From 8f12485d4bb87887082edbf89d4133dc3ccdc283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= Date: Wed, 12 Jul 2017 13:49:31 -0700 Subject: [PATCH] stylo: Fix grid-template serialization in grid shorthand Because of some unnecessary checks, it wasn't able to serialize the '40px / none' value properly before. --- components/style/properties/shorthand/position.mako.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/components/style/properties/shorthand/position.mako.rs b/components/style/properties/shorthand/position.mako.rs index 55f8c84555e..0e630b555ad 100644 --- a/components/style/properties/shorthand/position.mako.rs +++ b/components/style/properties/shorthand/position.mako.rs @@ -495,11 +495,9 @@ }) } - /// Returns true if every sub property value of `grid` shorthand is initial. impl<'a> LonghandsToSerialize<'a> { - fn is_initial(&self) -> bool { - *self.grid_template_rows == GridTemplateComponent::None && - *self.grid_template_columns == GridTemplateComponent::None && + /// Returns true if other sub properties except template-{rows,columns} are initial. + fn is_grid_template(&self) -> bool { *self.grid_template_areas == Either::Second(None_) && *self.grid_auto_rows == TrackSize::default() && *self.grid_auto_columns == TrackSize::default() && @@ -512,7 +510,7 @@ if *self.grid_template_areas != Either::Second(None_) || (*self.grid_template_rows != GridTemplateComponent::None && *self.grid_template_columns != GridTemplateComponent::None) || - self.is_initial() { + self.is_grid_template() { return super::grid_template::serialize_grid_template(self.grid_template_rows, self.grid_template_columns, self.grid_template_areas, dest);