forked from mirrors/gecko-dev
4a9c2d01e0
Automatic update from web-platform-tests [css-grid] Fix line name positions after auto repeat with no line names When serializing grid-template-rows/columns of a grid container, we need to handle auto repeat() specially in order to insert the line names at the correct places. Before this patch, this was skipped for indices before the insertion point of the auto repeat, and in case the auto repeat had no line name. The latter logic was wrong, if there is an auto repeat we still need the special code after the insertion point, even if it has no line names. The proper condition to check is whether there is no auto repeat. The patch also avoids a 2nd call to GridAutoRepeatRows/Columns since we already have the value in a variable. BUG=1011329 TEST=external/wpt/css/css-grid/parsing/grid-template-columns-computed-nogrid.html TEST=external/wpt/css/css-grid/parsing/grid-template-columns-computed.html TEST=external/wpt/css/css-grid/parsing/grid-template-rows-computed-nogrid.html TEST=external/wpt/css/css-grid/parsing/grid-template-rows-computed-withcontent.html TEST=external/wpt/css/css-grid/parsing/grid-template-rows-computed.html There are some test failures because integer repeat() is still expanded at computed-value time (http://crbug.com/989004). Change-Id: I16d06275384ab8c7866b4981ba8dcc665258b29d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857125 Reviewed-by: Manuel Rego <rego@igalia.com> Commit-Queue: Oriol Brufau <obrufau@igalia.com> Cr-Commit-Position: refs/heads/master@{#708661} -- wpt-commits: bff31b6a7587253edf50dba2f75426e0050cd7ba wpt-pr: 19661 Differential Revision: https://phabricator.services.mozilla.com/D53437
43 lines
3.1 KiB
HTML
43 lines
3.1 KiB
HTML
<!DOCTYPE html>
|
|
<meta charset="utf-8">
|
|
<title>CSS Grid Layout Test: getComputedStyle().gridTemplateColumns</title>
|
|
<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
|
|
<link rel="help" href="https://drafts.csswg.org/css-grid/#resolved-track-list" title="7.2.6. Resolved Value of a Track Listing">
|
|
<meta name="assert" content="Checks the resolved value of grid-template-columns on a grid container.">
|
|
<style>
|
|
#target {
|
|
display: grid;
|
|
width: 1px;
|
|
font-size: 1px;
|
|
}
|
|
</style>
|
|
<script src="/resources/testharness.js"></script>
|
|
<script src="/resources/testharnessreport.js"></script>
|
|
<script src="/css/support/computed-testcommon.js"></script>
|
|
<div id="target"></div>
|
|
<script>
|
|
test_computed_value("grid-template-columns", "none");
|
|
test_computed_value("grid-template-columns", "1px");
|
|
test_computed_value("grid-template-columns", "1px [a]");
|
|
test_computed_value("grid-template-columns", "1px [a] 2px");
|
|
test_computed_value("grid-template-columns", "[a] 1px");
|
|
test_computed_value("grid-template-columns", "[a] 1px [b]");
|
|
test_computed_value("grid-template-columns", "1px repeat(1, 2px) 3px", "1px 2px 3px");
|
|
test_computed_value("grid-template-columns", "1px repeat(auto-fill, 2px) 3px", "1px 2px 3px");
|
|
test_computed_value("grid-template-columns", "1px repeat(auto-fit, 2px) 3px", "1px 0px 3px");
|
|
test_computed_value("grid-template-columns", "1px [a] repeat(1, 2px 3px) [b] 4px", "1px [a] 2px 3px [b] 4px");
|
|
test_computed_value("grid-template-columns", "1px [a] repeat(auto-fill, 2px 3px) [b] 4px", "1px [a] 2px 3px [b] 4px");
|
|
test_computed_value("grid-template-columns", "1px [a] repeat(auto-fit, 2px 3px) [b] 4px", "1px [a] 0px 0px [b] 4px");
|
|
test_computed_value("grid-template-columns", "1px [a] repeat(1, [b] 2px [c]) [d] 3px", "1px [a b] 2px [c d] 3px");
|
|
test_computed_value("grid-template-columns", "1px [a] repeat(auto-fill, [b] 2px [c]) [d] 3px", "1px [a b] 2px [c d] 3px");
|
|
test_computed_value("grid-template-columns", "1px [a] repeat(auto-fit, [b] 2px [c]) [d] 3px", "1px [a b] 0px [c d] 3px");
|
|
test_computed_value("grid-template-columns", "[a] 1px repeat(1, 2px [b] 3px) 4px [d]", "[a] 1px 2px [b] 3px 4px [d]");
|
|
test_computed_value("grid-template-columns", "[a] 1px repeat(auto-fill, 2px [b] 3px) 4px [d]", "[a] 1px 2px [b] 3px 4px [d]");
|
|
test_computed_value("grid-template-columns", "[a] 1px repeat(auto-fit, 2px [b] 3px) 4px [d]", "[a] 1px 0px [b] 0px 4px [d]");
|
|
test_computed_value("grid-template-columns", "100% [a] repeat(1, [b] 200% [c]) [d] 300%", "1px [a b] 2px [c d] 3px");
|
|
test_computed_value("grid-template-columns", "100% [a] repeat(auto-fill, [b] 200% [c]) [d] 300%", "1px [a b] 2px [c d] 3px");
|
|
test_computed_value("grid-template-columns", "100% [a] repeat(auto-fit, [b] 200% [c]) [d] 300%", "1px [a b] 0px [c d] 3px");
|
|
test_computed_value("grid-template-columns", "[a] 1em repeat(1, 2em [b] 3em) 4em [d]", "[a] 1px 2px [b] 3px 4px [d]");
|
|
test_computed_value("grid-template-columns", "[a] 1em repeat(auto-fill, 2em [b] 3em) 4em [d]", "[a] 1px 2px [b] 3px 4px [d]");
|
|
test_computed_value("grid-template-columns", "[a] 1em repeat(auto-fit, 2em [b] 3em) 4em [d]", "[a] 1px 0px [b] 0px 4px [d]");
|
|
</script>
|