Skip to content

Commit 006e167

Browse files
[Masonry] Update display name to grid-lanes
Per CSSWG resolution [1], update display:masonry to display:grid-lanes. This change updates naming of all relevant methods related to the display type. There are still a number of references to masonry throughout test files, code files, file names, other property names etc. The rest of the references will be updated over the course of several follow up changes. This CL attempts to scope the updates to the display name as much as possible to aid in easier review. Apple landed a change for this, as well, so this change removes the TestExpectations files added as a result. This CL also removes a number of -expected.txt files that they added that were not supposed to be there, and moved the item-tolerance tests they added to the existing item-tolerance folder. [1] w3c/csswg-drafts#12022 (comment) Bug: 343257585, 461901693, 461896330 Change-Id: If8fd0a9881619451371a771a14ad155fc9ef68e8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7170998 Commit-Queue: Alison Maher <[email protected]> Reviewed-by: Kurt Catti-Schmidt <[email protected]> Cr-Commit-Position: refs/heads/main@{#1547493}
1 parent 5dc4441 commit 006e167

File tree

301 files changed

+1510
-1506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+1510
-1506
lines changed

css/css-display/parsing/tentative/display-valid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>CSS Display: Parsing display with valid values</title>
66
<link rel="author" title="Ethan Jimenez" href="mailto:[email protected]">
77
<link rel="help" href="https://tabatkins.github.io/specs/css-masonry/#masonry-containers">
8-
<meta name="assert" content="display supports the new values 'masonry | inline-masonry'.">
8+
<meta name="assert" content="display supports the new values 'grid-lanes | inline-grid-lanes'.">
99
<script src="/resources/testharness.js"></script>
1010
<script src="/resources/testharnessreport.js"></script>
1111
<script src="/css/support/parsing-testcommon.js"></script>

css/css-grid/masonry/tentative/abspos/column-masonry-alignment.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
margin: 20px;
2121
}
2222

23-
.masonry {
23+
.grid-lanes {
2424
display: grid-lanes;
2525
grid-template-columns: repeat(5, 150px);
2626
position: relative;
@@ -121,7 +121,7 @@
121121
</head>
122122
<body>
123123
<div class="container">
124-
<div class="masonry">
124+
<div class="grid-lanes">
125125
<div class="item">Item 1</div>
126126
<div class="item">Item 2</div>
127127
<div class="item">Item 3</div>

css/css-grid/masonry/tentative/abspos/column-masonry-intrinsic-sizing-oof.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
position: relative;
1616
}
1717

18-
.masonry {
18+
.grid-lanes {
1919
display: grid-lanes;
2020
grid-template-columns: repeat(3, auto);
2121
border: 2px solid blue;
@@ -46,7 +46,7 @@
4646
</head>
4747
<body>
4848
<div class="container">
49-
<div class="masonry">
49+
<div class="grid-lanes">
5050
<div class="oof-item oof-1"></div>
5151
<div class="oof-item oof-2"></div>
5252
</div>

css/css-grid/masonry/tentative/abspos/column-masonry-out-of-flow-001.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
margin: 20px;
1515
}
1616

17-
.masonry {
17+
.grid-lanes {
1818
display: grid-lanes;
1919
grid-template-columns: repeat(4, 10rem);
2020
justify-content: center;
@@ -74,7 +74,7 @@
7474
</head>
7575
<body>
7676
<div class="container">
77-
<div class="masonry">
77+
<div class="grid-lanes">
7878
<div class="abspos-first"></div>
7979
<div class="abspos-second"></div>
8080
<div class="abspos-third"></div>

css/css-grid/masonry/tentative/abspos/column-masonry-out-of-flow-002.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
margin: 20px;
1515
}
1616

17-
.masonry {
17+
.grid-lanes {
1818
display: grid-lanes;
1919
grid-template-columns: repeat(4, 60px);
2020
border: 1px solid blue;
@@ -63,7 +63,7 @@
6363
</head>
6464
<body>
6565
<div class="container">
66-
<div class="masonry">
66+
<div class="grid-lanes">
6767
<div class="item">
6868
<div class="wrapper">
6969
<div class="absolute"></div>

css/css-grid/masonry/tentative/abspos/column-masonry-out-of-flow-003.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
margin: 20px;
1616
}
1717

18-
.masonry {
18+
.grid-lanes {
1919
display: grid-lanes;
2020
grid-template-columns: 50px 100px 150px;
2121
border: 5px solid blue;
@@ -24,7 +24,7 @@
2424
gap: 10px;
2525
}
2626

27-
.masonry-item {
27+
.grid-lanes-item {
2828
background: lightgray;
2929
padding: 10px;
3030
height: 200px;
@@ -56,14 +56,14 @@
5656
</head>
5757
<body>
5858
<div class="container">
59-
<div class="masonry">
60-
<div class="masonry-item">
59+
<div class="grid-lanes">
60+
<div class="grid-lanes-item">
6161
<div class="nested-container">
6262
<div class="absolute"></div>
6363
</div>
6464
</div>
65-
<div class="masonry-item"></div>
66-
<div class="masonry-item"></div>
65+
<div class="grid-lanes-item"></div>
66+
<div class="grid-lanes-item"></div>
6767
<div class="static-pos"></div>
6868
</div>
6969
</div>

css/css-grid/masonry/tentative/abspos/column-masonry-positioned-item-dynamic-change.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<link rel="help" href="https://drafts.csswg.org/css-grid-3/#abspos">
88
<link rel="match" href="column-masonry-positioned-item-dynamic-change-ref.html">
99
<style>
10-
.masonry {
10+
.grid-lanes {
1111
display: grid-lanes;
1212
grid-template-columns: 75px 25px;
1313
position: relative;
@@ -25,7 +25,7 @@
2525
</style>
2626
</head>
2727
<body>
28-
<div class="masonry">
28+
<div class="grid-lanes">
2929
<div id="target" style="background: green; width: 100%; height: 25px;"></div>
3030
<div style="background: red; width: 100%; height: 25px;"></div>
3131
<div class="absolute"></div>

css/css-grid/masonry/tentative/abspos/row-masonry-alignment.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
margin: 20px;
2121
}
2222

23-
.masonry {
23+
.grid-lanes {
2424
display: grid-lanes;
2525
masonry-direction: row;
2626
grid-template-rows: repeat(5, 150px);
@@ -122,7 +122,7 @@
122122
</head>
123123
<body>
124124
<div class="container">
125-
<div class="masonry">
125+
<div class="grid-lanes">
126126
<div class="item">Item 1</div>
127127
<div class="item">Item 2</div>
128128
<div class="item">Item 3</div>

css/css-grid/masonry/tentative/abspos/row-masonry-intrinsic-sizing-oof.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
position: relative;
1616
}
1717

18-
.masonry {
18+
.grid-lanes {
1919
display: grid-lanes;
2020
masonry-direction: row;
2121
grid-template-rows: repeat(3, auto);
@@ -48,7 +48,7 @@
4848
</head>
4949
<body>
5050
<div class="container">
51-
<div class="masonry">
51+
<div class="grid-lanes">
5252
<div class="oof-item oof-1"></div>
5353
<div class="oof-item oof-2"></div>
5454
</div>

css/css-grid/masonry/tentative/abspos/row-masonry-out-of-flow-001.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
margin: 20px;
1515
}
1616

17-
.masonry {
17+
.grid-lanes {
1818
display: grid-lanes;
1919
masonry-direction: row;
2020
grid-template-rows: repeat(4, 8rem);
@@ -76,7 +76,7 @@
7676
</head>
7777
<body>
7878
<div class="container">
79-
<div class="masonry">
79+
<div class="grid-lanes">
8080
<div class="abspos-first"></div>
8181
<div class="abspos-second"></div>
8282
<div class="abspos-third"></div>

0 commit comments

Comments
 (0)