From e0b4619fa58c756cbde4fa5480f40c66abb6122b Mon Sep 17 00:00:00 2001 From: Emily McDonough Date: Thu, 19 Mar 2020 22:11:48 +0000 Subject: [PATCH] style: Enable multiple grid repeat values in Servo. Differential Revision: https://phabricator.services.mozilla.com/D60931 --- components/style/values/generics/grid.rs | 8 -------- components/style/values/specified/grid.rs | 10 ---------- 2 files changed, 18 deletions(-) diff --git a/components/style/values/generics/grid.rs b/components/style/values/generics/grid.rs index 1b95934e3c1..6f0f155912d 100644 --- a/components/style/values/generics/grid.rs +++ b/components/style/values/generics/grid.rs @@ -696,14 +696,6 @@ impl Parse for LineNameList { .take(num.value() as usize * names_list.len()), ), RepeatCount::AutoFill if fill_data.is_none() => { - // `repeat(autof-fill, ..)` should have just one line name. - // FIXME(bug 1341507) the above comment is wrong per: - // https://drafts.csswg.org/css-grid-2/#typedef-name-repeat - if names_list.len() != 1 { - return Err( - input.new_custom_error(StyleParseErrorKind::UnspecifiedError) - ); - } let fill_idx = line_names.len(); let fill_len = names_list.len(); fill_data = Some((fill_idx, fill_len)); diff --git a/components/style/values/specified/grid.rs b/components/style/values/specified/grid.rs index 4830aea24d6..54d31d5826d 100644 --- a/components/style/values/specified/grid.rs +++ b/components/style/values/specified/grid.rs @@ -185,16 +185,6 @@ impl TrackRepeat { values.push(track_size); names.push(current_names); - if is_auto { - // FIXME: In the older version of the spec - // (https://www.w3.org/TR/2015/WD-css-grid-1-20150917/#typedef-auto-repeat), - // if the repeat type is `` we shouldn't try to parse more than - // one `TrackSize`. But in current version of the spec, this is deprecated - // but we are adding this for gecko parity. We should remove this when - // gecko implements new spec. - names.push(input.try(parse_line_names).unwrap_or_default()); - break; - } } else { if values.is_empty() { // expecting at least one