Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: LayoutTests/fast/css-grid-layout/grid-item-auto-placement-automatic-span.html

Issue 314993002: [CSS Grid Layout] Fix auto-placement algorithm (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/rendering/RenderGrid.cpp » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <link href="resources/grid.css" rel="stylesheet"> 3 <link href="resources/grid.css" rel="stylesheet">
4 <style> 4 <style>
5 .grid { 5 .grid {
6 grid-auto-rows: 50px; 6 grid-auto-rows: 50px;
7 grid-auto-columns: 100px; 7 grid-auto-columns: 100px;
8 } 8 }
9 9
10 .gridNamedGridLinesColumns { 10 .gridNamedGridLinesColumns {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 grid-row: span 2 line; 69 grid-row: span 2 line;
70 } 70 }
71 </style> 71 </style>
72 <script src="../../resources/check-layout.js"></script> 72 <script src="../../resources/check-layout.js"></script>
73 <body onload="checkLayout('.grid');"> 73 <body onload="checkLayout('.grid');">
74 74
75 <p>Thist test checks that span is supported in auto-placement for automatic posi tions.</p> 75 <p>Thist test checks that span is supported in auto-placement for automatic posi tions.</p>
76 76
77 <div style="position: relative"> 77 <div style="position: relative">
78 <div class="grid gridAutoFlowRow"> 78 <div class="grid gridAutoFlowRow">
79 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="0 " data-offset-y="0" data-expected-width="200" data-expected-height="50"></div> 79 <div class="sizedToGridArea autoRowAutoColumnSpanning3" data-offset-x="0 " data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
80 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div> 80 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="0 " data-offset-y="50" data-expected-width="200" data-expected-height="50"></div>
81 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="50" data-expected-width="100" data-expected-height="50"></div> 81 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="0 " data-offset-y="100" data-expected-width="200" data-expected-height="50"></div>
82 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="1 00" data-offset-y="50" data-expected-width="200" data-expected-height="50"></div > 82 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="50" data-expected-width="100" data-expected-height="50"></div>
83 <div class="sizedToGridArea autoRowAutoColumnSpanning3" data-offset-x="0 " data-offset-y="100" data-expected-width="300" data-expected-height="50"></div> 83 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div>
84 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="0" data-offset-y="150" data-expected-width="200" data-expected-height="1 00"></div> 84 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="150" data-expected-width="100" data-expected-height="50"></div>
85 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="150" data-expected-width="100" data-expected-height="50"></div> 85 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="1 00" data-offset-y="150" data-expected-width="200" data-expected-height="50"></di v>
86 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="0" data-offset-y="200" data-expected-width="200" data-expected-height="1 00"></div>
86 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="200" data-expected-width="100" data-expected-height="50"></div> 87 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="200" data-expected-width="100" data-expected-height="50"></div>
87 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="250" data-expected-width="100" data-expected-height="50"></div> 88 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="250" data-expected-width="100" data-expected-height="50"></div>
88 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="250" data-expected-width="200" data-expected-height= "100"></div>
89 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="300" data-expected-width="100" data-expected-height="50"></div> 89 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="300" data-expected-width="100" data-expected-height="50"></div>
90 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="300" data-expected-width="200" data-expected-height= "100"></div>
91 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="350" data-expected-width="100" data-expected-height="50"></div>
90 </div> 92 </div>
Julien - ping for review 2014/06/10 00:08:05 I would have added an extra test case instead of p
Manuel Rego 2014/06/10 09:49:02 Ok, I've kept this as it is now and added a differ
91 </div> 93 </div>
92 94
93 <div style="position: relative"> 95 <div style="position: relative">
94 <div class="grid gridAutoFlowRow"> 96 <div class="grid gridAutoFlowRow">
95 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="0 " data-offset-y="0" data-expected-width="100" data-expected-height="100"></div> 97 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="0 " data-offset-y="0" data-expected-width="100" data-expected-height="100"></div>
96 <div class="sizedToGridArea autoRowSecondColumn" data-offset-x="100" dat a-offset-y="0" data-expected-width="100" data-expected-height="50"></div> 98 <div class="sizedToGridArea autoRowSecondColumn" data-offset-x="100" dat a-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
97 <div class="sizedToGridArea autoRowThirdColumn" data-offset-x="200" data -offset-y="0" data-expected-width="100" data-expected-height="50"></div> 99 <div class="sizedToGridArea autoRowThirdColumn" data-offset-x="200" data -offset-y="0" data-expected-width="100" data-expected-height="50"></div>
98 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div> 100 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div>
99 <div class="sizedToGridArea autoRowSpanning3AutoColumn" data-offset-x="0 " data-offset-y="100" data-expected-width="100" data-expected-height="150"></div > 101 <div class="sizedToGridArea autoRowSpanning3AutoColumn" data-offset-x="0 " data-offset-y="100" data-expected-width="100" data-expected-height="150"></div >
100 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="150" data-expected-width="200" data-expected-height= "100"></div> 102 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="150" data-expected-width="200" data-expected-height= "100"></div>
(...skipping 13 matching lines...) Expand all
114 <div class="sizedToGridArea autoRowFirstColumn" data-offset-x="0" data-o ffset-y="200" data-expected-width="50" data-expected-height="50"></div> 116 <div class="sizedToGridArea autoRowFirstColumn" data-offset-x="0" data-o ffset-y="200" data-expected-width="50" data-expected-height="50"></div>
115 <div class="sizedToGridArea autoRowAutoColumnSpanningLine" data-offset-x ="50" data-offset-y="200" data-expected-width="100" data-expected-height="50"></ div> 117 <div class="sizedToGridArea autoRowAutoColumnSpanningLine" data-offset-x ="50" data-offset-y="200" data-expected-width="100" data-expected-height="50"></ div>
116 <div class="sizedToGridArea autoRowThirdColumn" data-offset-x="150" data -offset-y="200" data-expected-width="200" data-expected-height="50"></div> 118 <div class="sizedToGridArea autoRowThirdColumn" data-offset-x="150" data -offset-y="200" data-expected-width="200" data-expected-height="50"></div>
117 <div class="sizedToGridArea autoRowAutoColumnSpanningLine" data-offset-x ="0" data-offset-y="250" data-expected-width="150" data-expected-height="50"></d iv> 119 <div class="sizedToGridArea autoRowAutoColumnSpanningLine" data-offset-x ="0" data-offset-y="250" data-expected-width="150" data-expected-height="50"></d iv>
118 <div class="sizedToGridArea autoRowAutoColumnSpanningLine" data-offset-x ="150" data-offset-y="250" data-expected-width="200" data-expected-height="50">< /div> 120 <div class="sizedToGridArea autoRowAutoColumnSpanningLine" data-offset-x ="150" data-offset-y="250" data-expected-width="200" data-expected-height="50">< /div>
119 </div> 121 </div>
120 </div> 122 </div>
121 123
122 <div style="position: relative"> 124 <div style="position: relative">
123 <div class="grid gridAutoFlowColumn"> 125 <div class="grid gridAutoFlowColumn">
124 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="0 " data-offset-y="0" data-expected-width="100" data-expected-height="100"></div> 126 <div class="sizedToGridArea autoRowSpanning3AutoColumn" data-offset-x="0 " data-offset-y="0" data-expected-width="100" data-expected-height="150"></div>
125 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-of fset-y="100" data-expected-width="100" data-expected-height="50"></div> 127 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="1 00" data-offset-y="0" data-expected-width="100" data-expected-height="100"></div >
126 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="100" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div> 128 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="2 00" data-offset-y="0" data-expected-width="100" data-expected-height="100"></div >
127 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="1 00" data-offset-y="50" data-expected-width="100" data-expected-height="100"></di v> 129 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="100" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div>
128 <div class="sizedToGridArea autoRowSpanning3AutoColumn" data-offset-x="2 00" data-offset-y="0" data-expected-width="100" data-expected-height="150"></div > 130 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="200" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div>
129 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="300" data-offset-y="0" data-expected-width="200" data-expected-height="1 00"></div> 131 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="300" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div>
130 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="300" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div> 132 <div class="sizedToGridArea autoRowSpanning2AutoColumn" data-offset-x="3 00" data-offset-y="50" data-expected-width="100" data-expected-height="100"></di v>
133 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="400" data-offset-y="0" data-expected-width="200" data-expected-height="1 00"></div>
131 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="400" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div> 134 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="400" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div>
132 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="500" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div> 135 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="500" data- offset-y="100" data-expected-width="100" data-expected-height="50"></div>
133 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="500" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div>
134 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="600" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div> 136 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="600" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div>
137 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="600" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div>
138 <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="700" data- offset-y="0" data-expected-width="100" data-expected-height="50"></div>
135 </div> 139 </div>
136 </div> 140 </div>
Julien - ping for review 2014/06/10 00:08:05 Ditto.
Manuel Rego 2014/06/10 09:49:02 The same here.
137 141
138 <div style="position: relative"> 142 <div style="position: relative">
139 <div class="grid gridAutoFlowColumn"> 143 <div class="grid gridAutoFlowColumn">
140 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="0 " data-offset-y="0" data-expected-width="200" data-expected-height="50"></div> 144 <div class="sizedToGridArea autoRowAutoColumnSpanning2" data-offset-x="0 " data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
141 <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data- offset-y="50" data-expected-width="100" data-expected-height="50"></div> 145 <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data- offset-y="50" data-expected-width="100" data-expected-height="50"></div>
142 <div class="sizedToGridArea thirdRowAutoColumn" data-offset-x="0" data-o ffset-y="100" data-expected-width="100" data-expected-height="50"></div> 146 <div class="sizedToGridArea thirdRowAutoColumn" data-offset-x="0" data-o ffset-y="100" data-expected-width="100" data-expected-height="50"></div>
143 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div> 147 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="100" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div>
144 <div class="sizedToGridArea autoRowAutoColumnSpanning3" data-offset-x="2 00" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div> 148 <div class="sizedToGridArea autoRowAutoColumnSpanning3" data-offset-x="2 00" data-offset-y="0" data-expected-width="300" data-expected-height="50"></div>
145 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="300" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div> 149 <div class="sizedToGridArea autoRowSpanning2AutoColumnSpanning2" data-of fset-x="300" data-offset-y="50" data-expected-width="200" data-expected-height=" 100"></div>
146 </div> 150 </div>
(...skipping 12 matching lines...) Expand all
159 <div class="sizedToGridArea firstRowAutoColumn" data-offset-x="400" data -offset-y="0" data-expected-width="100" data-expected-height="50"></div> 163 <div class="sizedToGridArea firstRowAutoColumn" data-offset-x="400" data -offset-y="0" data-expected-width="100" data-expected-height="50"></div>
160 <div class="sizedToGridArea autoRowSpanningLineAutoColumn" data-offset-x ="400" data-offset-y="50" data-expected-width="100" data-expected-height="100">< /div> 164 <div class="sizedToGridArea autoRowSpanningLineAutoColumn" data-offset-x ="400" data-offset-y="50" data-expected-width="100" data-expected-height="100">< /div>
161 <div class="sizedToGridArea thirdRowAutoColumn" data-offset-x="400" data -offset-y="150" data-expected-width="100" data-expected-height="200"></div> 165 <div class="sizedToGridArea thirdRowAutoColumn" data-offset-x="400" data -offset-y="150" data-expected-width="100" data-expected-height="200"></div>
162 <div class="sizedToGridArea autoRowSpanningLineAutoColumn" data-offset-x ="500" data-offset-y="0" data-expected-width="100" data-expected-height="150"></ div> 166 <div class="sizedToGridArea autoRowSpanningLineAutoColumn" data-offset-x ="500" data-offset-y="0" data-expected-width="100" data-expected-height="150"></ div>
163 <div class="sizedToGridArea autoRowSpanningLineAutoColumn" data-offset-x ="500" data-offset-y="150" data-expected-width="100" data-expected-height="200"> </div> 167 <div class="sizedToGridArea autoRowSpanningLineAutoColumn" data-offset-x ="500" data-offset-y="150" data-expected-width="100" data-expected-height="200"> </div>
164 </div> 168 </div>
165 </div> 169 </div>
166 170
167 </body> 171 </body>
168 </html> 172 </html>
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderGrid.cpp » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698