| Differences between
and this patch
- a/LayoutTests/ChangeLog +21 lines
Lines 1-3 a/LayoutTests/ChangeLog_sec1
1
2014-04-01  Javier Fernandez  <jfernandez@igalia.com>
2
3
        [CSS Grid Layout] Split the grid-item-margin-auto-columns-rows.html test.
4
        https://bugs.webkit.org/show_bug.cgi?id=131064
5
6
        Reviewed by Benjamin Poulain.
7
8
        Splitting the "grid-item-margin-auto-columns-rows" into different writing-modes
9
        related tests, so besides increasing clarity, it makes it fit in the 800x600 viewport.
10
11
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html: Removed.
12
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows.html: Removed.
13
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr-expected.html: Added.
14
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html: Added.
15
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl-expected.html: Added.
16
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html: Added.
17
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr-expected.html: Added.
18
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html: Added.
19
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl-expected.html: Added.
20
        * fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html: Added.
21
1
2014-05-21  Jinwoo Song  <jinwoo7.song@samsung.com>
22
2014-05-21  Jinwoo Song  <jinwoo7.song@samsung.com>
2
23
3
        Unreviewed EFL gardening.
24
        Unreviewed EFL gardening.
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html -199 lines
Lines 1-199 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-expected.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<style>
4
.grid {
5
   display: block;
6
   background-color: grey;
7
   width: 200px;
8
}
9
10
.gridLong {
11
   height: 120px;
12
}
13
14
.gridShort {
15
   height: 100px;
16
}
17
18
.firstRowFirstColumn {
19
   background-color: blue;
20
   position: absolute;
21
}
22
23
.firstRowSecondColumn {
24
   background-color: lime;
25
   position: absolute;
26
}
27
28
.secondRowFirstColumn {
29
   background-color: purple;
30
   position: absolute;
31
}
32
33
.secondRowSecondColumn {
34
   background-color: orange;
35
   position: absolute;
36
   left: 20px;
37
}
38
39
.gridItem {
40
    width: 20px;
41
    height: 40px;
42
}
43
44
.testContainer {
45
    position: relative;
46
    margin-bottom: 20px;
47
}
48
</style>
49
</head>
50
<body>
51
52
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
53
54
<div class="testContainer">
55
    <div class="grid gridLong">
56
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
57
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
58
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
59
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
60
    </div>
61
</div>
62
63
<div class="testContainer">
64
    <div class="grid gridShort">
65
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
66
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
67
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
68
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
69
    </div>
70
</div>
71
72
<div class="testContainer">
73
    <div class="grid gridLong">
74
        <div class="gridItem firstRowFirstColumn"   style="left: 180px; top: 20px;"></div>
75
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
76
        <div class="gridItem secondRowFirstColumn"  style="left: 160px;"></div>
77
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
78
    </div>
79
</div>
80
81
<div class="testContainer">
82
    <div class="grid gridShort">
83
        <div class="gridItem firstRowFirstColumn"   style="left: 180px; top: 20px;"></div>
84
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
85
        <div class="gridItem secondRowFirstColumn"  style="left: 160px;"></div>
86
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
87
    </div>
88
</div>
89
90
<div class="testContainer">
91
    <div class="grid gridLong">
92
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
93
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
94
        <div class="gridItem secondRowFirstColumn"  style="left: 20px;"></div>
95
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
96
    </div>
97
</div>
98
99
<div class="testContainer">
100
    <div class="grid gridShort">
101
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
102
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
103
        <div class="gridItem secondRowFirstColumn"  style="left: 20px;"></div>
104
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
105
    </div>
106
</div>
107
108
<div class="testContainer">
109
    <div class="grid gridLong">
110
        <div class="gridItem firstRowFirstColumn"   style="top: 80px;"></div>
111
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 80px;"></div>
112
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
113
        <div class="gridItem secondRowSecondColumn" style="top: 20px;"></div>
114
    </div>
115
</div>
116
117
<div class="testContainer">
118
    <div class="grid gridShort">
119
        <div class="gridItem firstRowFirstColumn"   style="top: 60px;"></div>
120
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 40px;"></div>
121
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
122
        <div class="gridItem secondRowSecondColumn" style="left: 20px;"></div>
123
    </div>
124
</div>
125
126
<div class="testContainer">
127
    <div class="grid gridLong">
128
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
129
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
130
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
131
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
132
    </div>
133
</div>
134
135
<div class="testContainer">
136
    <div class="grid gridShort">
137
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
138
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
139
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
140
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
141
    </div>
142
</div>
143
144
<div class="testContainer">
145
    <div class="grid gridLong">
146
        <div class="gridItem firstRowFirstColumn"   style="left: 180px;"></div>
147
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
148
        <div class="gridItem secondRowFirstColumn"  style="left: 160px;"></div>
149
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 80px;"></div>
150
    </div>
151
</div>
152
153
<div class="testContainer">
154
    <div class="grid gridShort">
155
        <div class="gridItem firstRowFirstColumn"   style="left: 180px;"></div>
156
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
157
        <div class="gridItem secondRowFirstColumn"  style="left: 160px; top: 20px;"></div>
158
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
159
    </div>
160
</div>
161
162
<div class="testContainer">
163
    <div class="grid gridLong">
164
        <div class="gridItem firstRowFirstColumn"   style="top: 0px;"></div>
165
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
166
        <div class="gridItem secondRowFirstColumn"  style="left: 20px;"></div>
167
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 80px;"></div>
168
    </div>
169
</div>
170
171
<div class="testContainer">
172
    <div class="grid gridShort">
173
        <div class="gridItem firstRowFirstColumn"   style="top: 0px;"></div>
174
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
175
        <div class="gridItem secondRowFirstColumn"  style="left: 20px; top: 20px;" ></div>
176
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
177
    </div>
178
</div>
179
180
<div class="testContainer">
181
    <div class="grid gridLong">
182
        <div class="gridItem firstRowFirstColumn"   style="top: 80px;"></div>
183
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 80px;"></div>
184
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
185
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 20px;"></div>
186
    </div>
187
</div>
188
189
<div class="testContainer">
190
    <div class="grid gridShort">
191
        <div class="gridItem firstRowFirstColumn"   style="top: 60px;"></div>
192
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 40px;"></div>
193
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
194
        <div class="gridItem secondRowSecondColumn" style="left: 20px;"></div>
195
    </div>
196
</div>
197
198
</body>
199
</html>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr-expected.html +91 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr-expected.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<style>
4
.grid {
5
   display: block;
6
   background-color: grey;
7
   width: 200px;
8
}
9
10
.gridLong {
11
   height: 120px;
12
}
13
14
.gridShort {
15
   height: 100px;
16
}
17
18
.firstRowFirstColumn {
19
   background-color: blue;
20
   position: absolute;
21
}
22
23
.firstRowSecondColumn {
24
   background-color: lime;
25
   position: absolute;
26
}
27
28
.secondRowFirstColumn {
29
   background-color: purple;
30
   position: absolute;
31
}
32
33
.secondRowSecondColumn {
34
   background-color: orange;
35
   position: absolute;
36
   left: 20px;
37
}
38
39
.gridItem {
40
    width: 20px;
41
    height: 40px;
42
}
43
44
.testContainer {
45
    position: relative;
46
    margin-bottom: 20px;
47
}
48
</style>
49
</head>
50
<body>
51
52
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
53
54
<div class="testContainer">
55
    <div class="grid gridLong">
56
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
57
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
58
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
59
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
60
    </div>
61
</div>
62
63
<div class="testContainer">
64
    <div class="grid gridShort">
65
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
66
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
67
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
68
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
69
    </div>
70
</div>
71
72
<div class="testContainer">
73
    <div class="grid gridLong">
74
        <div class="gridItem firstRowFirstColumn"   style="top: 80px;"></div>
75
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 80px;"></div>
76
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
77
        <div class="gridItem secondRowSecondColumn" style="top: 20px;"></div>
78
    </div>
79
</div>
80
81
<div class="testContainer">
82
    <div class="grid gridShort">
83
        <div class="gridItem firstRowFirstColumn"   style="top: 60px;"></div>
84
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 40px;"></div>
85
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
86
        <div class="gridItem secondRowSecondColumn" style="left: 20px;"></div>
87
    </div>
88
</div>
89
90
</body>
91
</html>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html +75 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<script>
4
if (window.testRunner)
5
    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
6
</script>
7
<link href="resources/grid.css" rel="stylesheet">
8
<style>
9
.grid {
10
    -webkit-grid-template-rows: auto auto;
11
    -webkit-grid-template-columns: auto auto;
12
    width: 200px;
13
}
14
15
.gridItem {
16
    width: 20px;
17
    height: 40px;
18
}
19
20
.marginTop {
21
    margin-top: 20px;
22
}
23
24
.marginBottom {
25
    margin-bottom: 20px;
26
}
27
28
.testContainer {
29
    position: relative;
30
    margin-bottom: 20px;
31
}
32
</style>
33
</head>
34
<body>
35
36
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
37
38
<div class="testContainer">
39
    <div class="grid">
40
        <div class="gridItem marginTop firstRowFirstColumn"></div>
41
        <div class="gridItem firstRowSecondColumn"></div>
42
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
43
        <div class="gridItem secondRowSecondColumn"></div>
44
    </div>
45
</div>
46
47
<div class="testContainer">
48
    <div class="grid">
49
        <div class="gridItem marginTop firstRowFirstColumn"></div>
50
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
51
        <div class="gridItem secondRowFirstColumn"></div>
52
        <div class="gridItem secondRowSecondColumn"></div>
53
    </div>
54
</div>
55
56
<div class="testContainer">
57
    <div class="grid horizontalBT">
58
        <div class="gridItem marginTop firstRowFirstColumn"></div>
59
        <div class="gridItem firstRowSecondColumn"></div>
60
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
61
        <div class="gridItem secondRowSecondColumn"></div>
62
    </div>
63
</div>
64
65
<div class="testContainer">
66
    <div class="grid horizontalBT">
67
        <div class="gridItem marginTop firstRowFirstColumn"></div>
68
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
69
        <div class="gridItem secondRowFirstColumn"></div>
70
        <div class="gridItem secondRowSecondColumn"></div>
71
    </div>
72
</div>
73
74
</body>
75
</html>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl-expected.html +91 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl-expected.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<style>
4
.grid {
5
   display: block;
6
   background-color: grey;
7
   width: 200px;
8
}
9
10
.gridLong {
11
   height: 120px;
12
}
13
14
.gridShort {
15
   height: 100px;
16
}
17
18
.firstRowFirstColumn {
19
   background-color: blue;
20
   position: absolute;
21
}
22
23
.firstRowSecondColumn {
24
   background-color: lime;
25
   position: absolute;
26
}
27
28
.secondRowFirstColumn {
29
   background-color: purple;
30
   position: absolute;
31
}
32
33
.secondRowSecondColumn {
34
   background-color: orange;
35
   position: absolute;
36
   left: 20px;
37
}
38
39
.gridItem {
40
    width: 20px;
41
    height: 40px;
42
}
43
44
.testContainer {
45
    position: relative;
46
    margin-bottom: 20px;
47
}
48
</style>
49
</head>
50
<body>
51
52
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
53
54
<div class="testContainer">
55
    <div class="grid gridLong">
56
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
57
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
58
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
59
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
60
    </div>
61
</div>
62
63
<div class="testContainer">
64
    <div class="grid gridShort">
65
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
66
        <div class="gridItem firstRowSecondColumn"  style="left: 20px;"></div>
67
        <div class="gridItem secondRowFirstColumn"  style="top: 60px;"></div>
68
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
69
    </div>
70
</div>
71
72
<div class="testContainer">
73
    <div class="grid gridLong">
74
        <div class="gridItem firstRowFirstColumn"   style="top: 80px;"></div>
75
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 80px;"></div>
76
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
77
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 20px;"></div>
78
    </div>
79
</div>
80
81
<div class="testContainer">
82
    <div class="grid gridShort">
83
        <div class="gridItem firstRowFirstColumn"   style="top: 60px;"></div>
84
        <div class="gridItem firstRowSecondColumn"  style="left: 20px; top: 40px;"></div>
85
        <div class="gridItem secondRowFirstColumn"  style="left: 0px;"></div>
86
        <div class="gridItem secondRowSecondColumn" style="left: 20px;"></div>
87
    </div>
88
</div>
89
90
</body>
91
</html>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html +72 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<script>
4
if (window.testRunner)
5
    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
6
</script>
7
<link href="resources/grid.css" rel="stylesheet">
8
<style>
9
.grid {
10
    -webkit-grid-template-rows: auto auto;
11
    -webkit-grid-template-columns: auto auto;
12
    width: 200px;
13
}
14
15
.gridItem {
16
    width: 20px;
17
    height: 40px;
18
}
19
20
.marginTop {
21
    margin-top: 20px;
22
}
23
24
.marginBottom {
25
    margin-bottom: 20px;
26
}
27
28
.testContainer {
29
    position: relative;
30
    margin-bottom: 20px;
31
}
32
33
</style>
34
</head>
35
<body>
36
37
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
38
<div class="testContainer">
39
    <div class="grid directionRTL">
40
        <div class="gridItem marginTop firstRowFirstColumn"></div>
41
        <div class="gridItem firstRowSecondColumn"></div>
42
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
43
        <div class="gridItem secondRowSecondColumn"></div>
44
    </div>
45
</div>
46
47
<div class="testContainer">
48
    <div class="grid directionRTL">
49
        <div class="gridItem marginTop firstRowFirstColumn"></div>
50
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
51
        <div class="gridItem secondRowFirstColumn"></div>
52
        <div class="gridItem secondRowSecondColumn"></div>
53
    </div>
54
</div>
55
56
<div class="testContainer">
57
    <div class="grid horizontalBT directionRTL">
58
        <div class="gridItem marginTop firstRowFirstColumn"></div>
59
        <div class="gridItem firstRowSecondColumn"></div>
60
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
61
        <div class="gridItem secondRowSecondColumn"></div>
62
    </div>
63
</div>
64
65
<div class="testContainer">
66
    <div class="grid horizontalBT directionRTL">
67
        <div class="gridItem marginTop firstRowFirstColumn"></div>
68
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
69
        <div class="gridItem secondRowFirstColumn"></div>
70
        <div class="gridItem secondRowSecondColumn"></div>
71
    </div>
72
</div>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr-expected.html +91 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr-expected.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<style>
4
.grid {
5
   display: block;
6
   background-color: grey;
7
   width: 200px;
8
}
9
10
.gridLong {
11
   height: 120px;
12
}
13
14
.gridShort {
15
   height: 100px;
16
}
17
18
.firstRowFirstColumn {
19
   background-color: blue;
20
   position: absolute;
21
}
22
23
.firstRowSecondColumn {
24
   background-color: lime;
25
   position: absolute;
26
}
27
28
.secondRowFirstColumn {
29
   background-color: purple;
30
   position: absolute;
31
}
32
33
.secondRowSecondColumn {
34
   background-color: orange;
35
   position: absolute;
36
   left: 20px;
37
}
38
39
.gridItem {
40
    width: 20px;
41
    height: 40px;
42
}
43
44
.testContainer {
45
    position: relative;
46
    margin-bottom: 20px;
47
}
48
</style>
49
</head>
50
<body>
51
52
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
53
54
<div class="testContainer">
55
    <div class="grid gridLong">
56
        <div class="gridItem firstRowFirstColumn"   style="left: 180px; top: 20px;"></div>
57
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
58
        <div class="gridItem secondRowFirstColumn"  style="left: 160px;"></div>
59
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
60
    </div>
61
</div>
62
63
<div class="testContainer">
64
    <div class="grid gridShort">
65
        <div class="gridItem firstRowFirstColumn"   style="left: 180px; top: 20px;"></div>
66
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
67
        <div class="gridItem secondRowFirstColumn"  style="left: 160px;"></div>
68
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
69
    </div>
70
</div>
71
72
<div class="testContainer">
73
    <div class="grid gridLong">
74
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
75
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
76
        <div class="gridItem secondRowFirstColumn"  style="left: 20px;"></div>
77
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
78
    </div>
79
</div>
80
81
<div class="testContainer">
82
    <div class="grid gridShort">
83
        <div class="gridItem firstRowFirstColumn"   style="top: 20px;"></div>
84
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
85
        <div class="gridItem secondRowFirstColumn"  style="left: 20px;"></div>
86
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
87
    </div>
88
</div>
89
90
</body>
91
</html>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html +73 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<script>
4
if (window.testRunner)
5
    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
6
</script>
7
<link href="resources/grid.css" rel="stylesheet">
8
<style>
9
.grid {
10
    -webkit-grid-template-rows: auto auto;
11
    -webkit-grid-template-columns: auto auto;
12
    width: 200px;
13
}
14
15
.gridItem {
16
    width: 20px;
17
    height: 40px;
18
}
19
20
.marginTop {
21
    margin-top: 20px;
22
}
23
24
.marginBottom {
25
    margin-bottom: 20px;
26
}
27
28
.testContainer {
29
    position: relative;
30
    margin-bottom: 20px;
31
}
32
33
</style>
34
</head>
35
<body>
36
37
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
38
39
<div class="testContainer">
40
    <div class="grid verticalRL">
41
        <div class="gridItem marginTop firstRowFirstColumn"></div>
42
        <div class="gridItem firstRowSecondColumn"></div>
43
        <div class="gridItem secondRowFirstColumn"></div>
44
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
45
    </div>
46
</div>
47
48
<div class="testContainer">
49
    <div class="grid verticalRL">
50
        <div class="gridItem marginTop firstRowFirstColumn"></div>
51
        <div class="gridItem firstRowSecondColumn"></div>
52
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
53
        <div class="gridItem secondRowSecondColumn"></div>
54
    </div>
55
</div>
56
57
<div class="testContainer">
58
    <div class="grid verticalLR">
59
        <div class="gridItem marginTop firstRowFirstColumn"></div>
60
        <div class="gridItem firstRowSecondColumn"></div>
61
        <div class="gridItem secondRowFirstColumn"></div>
62
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
63
    </div>
64
</div>
65
66
<div class="testContainer">
67
    <div class="grid verticalLR">
68
        <div class="gridItem marginTop firstRowFirstColumn"></div>
69
        <div class="gridItem firstRowSecondColumn"></div>
70
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
71
        <div class="gridItem secondRowSecondColumn"></div>
72
    </div>
73
</div>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl-expected.html +88 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl-expected.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<style>
4
.grid {
5
   display: block;
6
   background-color: grey;
7
   width: 200px;
8
}
9
10
.gridLong {
11
   height: 120px;
12
}
13
14
.gridShort {
15
   height: 100px;
16
}
17
18
.firstRowFirstColumn {
19
   background-color: blue;
20
   position: absolute;
21
}
22
23
.firstRowSecondColumn {
24
   background-color: lime;
25
   position: absolute;
26
}
27
28
.secondRowFirstColumn {
29
   background-color: purple;
30
   position: absolute;
31
}
32
33
.secondRowSecondColumn {
34
   background-color: orange;
35
   position: absolute;
36
   left: 20px;
37
}
38
39
.gridItem {
40
    width: 20px;
41
    height: 40px;
42
}
43
44
.testContainer {
45
    position: relative;
46
    margin-bottom: 20px;
47
}
48
</style>
49
</head>
50
<body>
51
52
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
53
54
<div class="testContainer">
55
    <div class="grid gridLong">
56
        <div class="gridItem firstRowFirstColumn"   style="left: 180px;"></div>
57
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
58
        <div class="gridItem secondRowFirstColumn"  style="left: 160px;"></div>
59
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 80px;"></div>
60
    </div>
61
</div>
62
63
<div class="testContainer">
64
    <div class="grid gridShort">
65
        <div class="gridItem firstRowFirstColumn"   style="left: 180px;"></div>
66
        <div class="gridItem firstRowSecondColumn"  style="left: 180px; top: 60px;"></div>
67
        <div class="gridItem secondRowFirstColumn"  style="left: 160px; top: 20px;"></div>
68
        <div class="gridItem secondRowSecondColumn" style="left: 160px; top: 60px;"></div>
69
    </div>
70
</div>
71
72
<div class="testContainer">
73
    <div class="grid gridLong">
74
        <div class="gridItem firstRowFirstColumn"   style="top: 0px;"></div>
75
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
76
        <div class="gridItem secondRowFirstColumn"  style="left: 20px;"></div>
77
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 80px;"></div>
78
    </div>
79
</div>
80
81
<div class="testContainer">
82
    <div class="grid gridShort">
83
        <div class="gridItem firstRowFirstColumn"   style="top: 0px;"></div>
84
        <div class="gridItem firstRowSecondColumn"  style="top: 60px;"></div>
85
        <div class="gridItem secondRowFirstColumn"  style="left: 20px; top: 20px;" ></div>
86
        <div class="gridItem secondRowSecondColumn" style="left: 20px; top: 60px;"></div>
87
    </div>
88
</div>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html +76 lines
Line 0 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<script>
4
if (window.testRunner)
5
    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
6
</script>
7
<link href="resources/grid.css" rel="stylesheet">
8
<style>
9
.grid {
10
    -webkit-grid-template-rows: auto auto;
11
    -webkit-grid-template-columns: auto auto;
12
    width: 200px;
13
}
14
15
.gridItem {
16
    width: 20px;
17
    height: 40px;
18
}
19
20
.marginTop {
21
    margin-top: 20px;
22
}
23
24
.marginBottom {
25
    margin-bottom: 20px;
26
}
27
28
.testContainer {
29
    position: relative;
30
    margin-bottom: 20px;
31
}
32
33
</style>
34
</head>
35
<body>
36
37
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
38
39
<div class="testContainer">
40
    <div class="grid verticalRL directionRTL">
41
        <div class="gridItem marginTop firstRowFirstColumn"></div>
42
        <div class="gridItem firstRowSecondColumn"></div>
43
        <div class="gridItem secondRowFirstColumn"></div>
44
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
45
    </div>
46
</div>
47
48
<div class="testContainer">
49
    <div class="grid verticalRL directionRTL">
50
        <div class="gridItem marginTop firstRowFirstColumn"></div>
51
        <div class="gridItem firstRowSecondColumn"></div>
52
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
53
        <div class="gridItem secondRowSecondColumn"></div>
54
    </div>
55
</div>
56
57
<div class="testContainer">
58
    <div class="grid verticalLR directionRTL">
59
        <div class="gridItem marginTop firstRowFirstColumn"></div>
60
        <div class="gridItem firstRowSecondColumn"></div>
61
        <div class="gridItem secondRowFirstColumn"></div>
62
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
63
    </div>
64
</div>
65
66
<div class="testContainer">
67
    <div class="grid verticalLR directionRTL">
68
        <div class="gridItem marginTop firstRowFirstColumn"></div>
69
        <div class="gridItem firstRowSecondColumn"></div>
70
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
71
        <div class="gridItem secondRowSecondColumn"></div>
72
    </div>
73
</div>
74
75
</body>
76
</html>
- a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html -181 lines
Lines 1-181 a/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html_sec1
1
<!DOCTYPE html>
2
<html>
3
<link href="resources/grid.css" rel="stylesheet">
4
<style>
5
.grid {
6
    -webkit-grid-template-rows: auto auto;
7
    -webkit-grid-template-columns: auto auto;
8
    width: 200px;
9
}
10
11
.gridItem {
12
    width: 20px;
13
    height: 40px;
14
}
15
16
.marginTop {
17
    margin-top: 20px;
18
}
19
20
.marginBottom {
21
    margin-bottom: 20px;
22
}
23
24
.testContainer {
25
    position: relative;
26
    margin-bottom: 20px;
27
}
28
29
</style>
30
</head>
31
<body>
32
33
<div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
34
35
<div class="testContainer">
36
    <div class="grid">
37
        <div class="gridItem marginTop firstRowFirstColumn"></div>
38
        <div class="gridItem firstRowSecondColumn"></div>
39
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
40
        <div class="gridItem secondRowSecondColumn"></div>
41
    </div>
42
</div>
43
44
<div class="testContainer">
45
    <div class="grid">
46
        <div class="gridItem marginTop firstRowFirstColumn"></div>
47
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
48
        <div class="gridItem secondRowFirstColumn"></div>
49
        <div class="gridItem secondRowSecondColumn"></div>
50
    </div>
51
</div>
52
53
<div class="testContainer">
54
    <div class="grid verticalRL">
55
        <div class="gridItem marginTop firstRowFirstColumn"></div>
56
        <div class="gridItem firstRowSecondColumn"></div>
57
        <div class="gridItem secondRowFirstColumn"></div>
58
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
59
    </div>
60
</div>
61
62
<div class="testContainer">
63
    <div class="grid verticalRL">
64
        <div class="gridItem marginTop firstRowFirstColumn"></div>
65
        <div class="gridItem firstRowSecondColumn"></div>
66
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
67
        <div class="gridItem secondRowSecondColumn"></div>
68
    </div>
69
</div>
70
71
<div class="testContainer">
72
    <div class="grid verticalLR">
73
        <div class="gridItem marginTop firstRowFirstColumn"></div>
74
        <div class="gridItem firstRowSecondColumn"></div>
75
        <div class="gridItem secondRowFirstColumn"></div>
76
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
77
    </div>
78
</div>
79
80
<div class="testContainer">
81
    <div class="grid verticalLR">
82
        <div class="gridItem marginTop firstRowFirstColumn"></div>
83
        <div class="gridItem firstRowSecondColumn"></div>
84
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
85
        <div class="gridItem secondRowSecondColumn"></div>
86
    </div>
87
</div>
88
89
<div class="testContainer">
90
    <div class="grid horizontalBT">
91
        <div class="gridItem marginTop firstRowFirstColumn"></div>
92
        <div class="gridItem firstRowSecondColumn"></div>
93
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
94
        <div class="gridItem secondRowSecondColumn"></div>
95
    </div>
96
</div>
97
98
<div class="testContainer">
99
    <div class="grid horizontalBT">
100
        <div class="gridItem marginTop firstRowFirstColumn"></div>
101
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
102
        <div class="gridItem secondRowFirstColumn"></div>
103
        <div class="gridItem secondRowSecondColumn"></div>
104
    </div>
105
</div>
106
107
<!-- rtl direction -->
108
<div class="testContainer">
109
    <div class="grid directionRTL">
110
        <div class="gridItem marginTop firstRowFirstColumn"></div>
111
        <div class="gridItem firstRowSecondColumn"></div>
112
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
113
        <div class="gridItem secondRowSecondColumn"></div>
114
    </div>
115
</div>
116
117
<div class="testContainer">
118
    <div class="grid directionRTL">
119
        <div class="gridItem marginTop firstRowFirstColumn"></div>
120
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
121
        <div class="gridItem secondRowFirstColumn"></div>
122
        <div class="gridItem secondRowSecondColumn"></div>
123
    </div>
124
</div>
125
126
<div class="testContainer">
127
    <div class="grid verticalRL directionRTL">
128
        <div class="gridItem marginTop firstRowFirstColumn"></div>
129
        <div class="gridItem firstRowSecondColumn"></div>
130
        <div class="gridItem secondRowFirstColumn"></div>
131
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
132
    </div>
133
</div>
134
135
<div class="testContainer">
136
    <div class="grid verticalRL directionRTL">
137
        <div class="gridItem marginTop firstRowFirstColumn"></div>
138
        <div class="gridItem firstRowSecondColumn"></div>
139
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
140
        <div class="gridItem secondRowSecondColumn"></div>
141
    </div>
142
</div>
143
144
<div class="testContainer">
145
    <div class="grid verticalLR directionRTL">
146
        <div class="gridItem marginTop firstRowFirstColumn"></div>
147
        <div class="gridItem firstRowSecondColumn"></div>
148
        <div class="gridItem secondRowFirstColumn"></div>
149
        <div class="gridItem marginBottom secondRowSecondColumn"></div>
150
    </div>
151
</div>
152
153
<div class="testContainer">
154
    <div class="grid verticalLR directionRTL">
155
        <div class="gridItem marginTop firstRowFirstColumn"></div>
156
        <div class="gridItem firstRowSecondColumn"></div>
157
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
158
        <div class="gridItem secondRowSecondColumn"></div>
159
    </div>
160
</div>
161
162
<div class="testContainer">
163
    <div class="grid horizontalBT directionRTL">
164
        <div class="gridItem marginTop firstRowFirstColumn"></div>
165
        <div class="gridItem firstRowSecondColumn"></div>
166
        <div class="gridItem marginBottom secondRowFirstColumn"></div>
167
        <div class="gridItem secondRowSecondColumn"></div>
168
    </div>
169
</div>
170
171
<div class="testContainer">
172
    <div class="grid horizontalBT directionRTL">
173
        <div class="gridItem marginTop firstRowFirstColumn"></div>
174
        <div class="gridItem marginBottom firstRowSecondColumn"></div>
175
        <div class="gridItem secondRowFirstColumn"></div>
176
        <div class="gridItem secondRowSecondColumn"></div>
177
    </div>
178
</div>
179
180
</body>
181
</html>

Return to Bug 131064