Skip to content

Commit

Permalink
Bug 1796295 [wpt PR 36561] - Stop conservatively rejecting none/norma…
Browse files Browse the repository at this point in the history
…l/auto on newer <custom-ident> values., a=testonly

Automatic update from web-platform-tests
Stop conservatively rejecting none/normal/auto on newer <custom-ident> values.

In w3c/csswg-drafts#7431 the CSS Working Group
resolved not to try to restrict none/normal/auto keywords, so there's no
need to reject them to avoid worsening potential compatibility problems.

Based on specs at https://drafts.csswg.org/css-contain-3/#container-name
and https://drafts.csswg.org/css-contain-3/#container-rule, this adjusts
ConsumeSingleContainerName to accept 'normal' and instead reject 'none'.

Fixed: 1340852
Change-Id: I53b78e412b0797210c1b5463401bcc055f7bd550
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3966666
Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
Commit-Queue: David Baron <dbaron@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1061600}

--

wpt-commits: b602a0af80e724f8d1828341cfacb29842f02103
wpt-pr: 36561
  • Loading branch information
dbaron authored and moz-wptsync-bot committed Nov 7, 2022
1 parent ad34e9b commit 61850d4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@
test_container_name_valid('foo');
test_container_name_valid(' foo');
test_container_name_valid(' foo ');
test_container_name_valid('normal');
test_container_name_valid('Normal');
test_container_name_valid('auto');
test_container_name_valid('Auto');

test_container_name_invalid('foo foo');
test_container_name_invalid('1px');
Expand All @@ -175,12 +179,12 @@
test_container_name_invalid('type(inline-size)');
test_container_name_invalid('"foo"');
test_container_name_invalid('"inherit"');
test_container_name_invalid('inherit');
test_container_name_invalid('INITIAL');
test_container_name_invalid('Unset');
test_container_name_invalid('deFAULT');
test_container_name_invalid('none');
test_container_name_invalid('None');
test_container_name_invalid('normal');
test_container_name_invalid('Normal');
test_container_name_invalid('auto');
test_container_name_invalid('Auto');
test_container_name_invalid('and');
test_container_name_invalid('or');
test_container_name_invalid('not');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
test_valid_value('container-name', 'foo bar');
test_valid_value('container-name', 'foo foo');
test_valid_value('container-name', '\\!escaped');
test_valid_value('container-name', 'auto');
test_valid_value('container-name', 'normal');

test_invalid_value('container-name', 'auto');
test_invalid_value('container-name', 'normal');
test_invalid_value('container-name', 'none none');
test_invalid_value('container-name', 'foo, bar');
test_invalid_value('container-name', '#fff');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
test_valid_value('container', 'FOO / size');
test_valid_value('container', 'FOO/size', 'FOO / size');
test_valid_value('container', ' FOO /size', 'FOO / size');
test_valid_value('container', 'normal / size');
test_valid_value('container', 'auto / size');

test_invalid_value('container', 'none none');
test_invalid_value('container', 'none inline-size');
Expand All @@ -43,8 +45,6 @@
test_invalid_value('container', 'none, normal');
test_invalid_value('container', 'none / none');
test_invalid_value('container', 'none / auto');
test_invalid_value('container', 'normal / size');
test_invalid_value('container', 'auto / size');
test_invalid_value('container', 'none / foo');
test_invalid_value('container', 'none / foo, bar');
test_invalid_value('container', '#fff');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
test_valid_value('scroll-timeline-name', 'abc');
test_valid_value('scroll-timeline-name', ' abc', 'abc');
test_valid_value('scroll-timeline-name', 'aBc');
test_valid_value('scroll-timeline-name', 'auto');

test_invalid_value('scroll-timeline-name', 'auto');
test_invalid_value('scroll-timeline-name', 'default');
test_invalid_value('scroll-timeline-name', '10px');
test_invalid_value('scroll-timeline-name', 'foo bar');
test_invalid_value('scroll-timeline-name', '"foo" "bar"');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
test_valid_value('view-timeline-name', 'bar, foo');
test_valid_value('view-timeline-name', 'none, none');
test_valid_value('view-timeline-name', 'a, none, b');
test_valid_value('view-timeline-name', 'auto');

test_invalid_value('view-timeline-name', 'auto');
test_invalid_value('view-timeline-name', 'default');
test_invalid_value('view-timeline-name', '10px');
test_invalid_value('view-timeline-name', 'foo bar');
test_invalid_value('view-timeline-name', '"foo" "bar"');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@

test_valid_value('view-timeline', 'a, b, c');
test_valid_value('view-timeline', 'a inline, b block, c vertical', 'a inline, b, c vertical');
test_valid_value('view-timeline', 'auto');

test_invalid_value('view-timeline', 'abc abc');
test_invalid_value('view-timeline', 'block none');
test_invalid_value('view-timeline', 'none none');
test_invalid_value('view-timeline', 'auto');
test_invalid_value('view-timeline', 'default');
test_invalid_value('view-timeline', ',');
test_invalid_value('view-timeline', ',,block,,');

Expand Down

0 comments on commit 61850d4

Please sign in to comment.