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

Side by Side Diff: LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html

Issue 24031007: RenderGrid should include grid items' margins in its intrinsic size (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths-expected.txt » ('j') | no next file with comments »
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 <head> 3 <head>
4 <script> 4 <script>
5 if (window.testRunner) 5 if (window.testRunner)
6 testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1); 6 testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
7 </script> 7 </script>
8 <link href="resources/grid.css" rel=stylesheet> 8 <link href="resources/grid.css" rel=stylesheet>
9 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel =stylesheet> 9 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel =stylesheet>
10 <style> 10 <style>
(...skipping 18 matching lines...) Expand all
29 .gridFixedFixed { 29 .gridFixedFixed {
30 grid-definition-columns: minmax(30px, 40px) minmax(30px, 40px); 30 grid-definition-columns: minmax(30px, 40px) minmax(30px, 40px);
31 grid-definition-rows: 10px; 31 grid-definition-rows: 10px;
32 } 32 }
33 33
34 .gridAutoContent { 34 .gridAutoContent {
35 grid-definition-columns: auto auto; 35 grid-definition-columns: auto auto;
36 grid-definition-rows: 10px; 36 grid-definition-rows: 10px;
37 font: 10px/1 Ahem; 37 font: 10px/1 Ahem;
38 } 38 }
39
40 .margins {
41 margin: 10px 20px 30px 40px;
42 }
39 </style> 43 </style>
40 </head> 44 </head>
41 <script src="../../resources/check-layout.js"></script> 45 <script src="../../resources/check-layout.js"></script>
42 <body onload="checkLayout('.grid')"> 46 <body onload="checkLayout('.grid')">
43 <body> 47 <body>
44 <p>This test checks that the grid element's preferred logical widths are properl y computed with different combinations of minmax().</p> 48 <p>This test checks that the grid element's preferred logical widths are properl y computed with different combinations of minmax().</p>
45 <div class="grid gridMinContentFixed min-content" data-expected-height="10" data -expected-width="40"> 49 <div class="grid gridMinContentFixed min-content" data-expected-height="10" data -expected-width="40">
46 <div class="firstRowFirstColumn">XX XX XX</div> 50 <div class="firstRowFirstColumn">XX XX XX</div>
47 <div class="firstRowSecondColumn">XX XX XX</div> 51 <div class="firstRowSecondColumn">XX XX XX</div>
48 </div> 52 </div>
(...skipping 21 matching lines...) Expand all
70 <div class="grid gridFixedFixed max-content" data-expected-height="10" data-expe cted-width="80"></div> 74 <div class="grid gridFixedFixed max-content" data-expected-height="10" data-expe cted-width="80"></div>
71 <div class="grid gridAutoContent min-content" data-expected-height="10" data-exp ected-width="40"> 75 <div class="grid gridAutoContent min-content" data-expected-height="10" data-exp ected-width="40">
72 <div class="firstRowFirstColumn">XX XX XX</div> 76 <div class="firstRowFirstColumn">XX XX XX</div>
73 <div class="firstRowSecondColumn">XX XX XX</div> 77 <div class="firstRowSecondColumn">XX XX XX</div>
74 </div> 78 </div>
75 <div class="grid gridAutoContent max-content" data-expected-height="10" data-exp ected-width="160"> 79 <div class="grid gridAutoContent max-content" data-expected-height="10" data-exp ected-width="160">
76 <div class="firstRowFirstColumn">XX XX XX</div> 80 <div class="firstRowFirstColumn">XX XX XX</div>
77 <div class="firstRowSecondColumn">XX XX XX</div> 81 <div class="firstRowSecondColumn">XX XX XX</div>
78 </div> 82 </div>
79 83
84 <!-- Now with margin on one of the grid items. -->
85 <div class="grid gridMinContentFixed min-content" data-expected-height="10" data -expected-width="100">
86 <div class="firstRowFirstColumn">XX XX XX</div>
87 <div class="firstRowSecondColumn margins">XX XX XX</div>
88 </div>
89 <div class="grid gridMinContentFixed max-content" data-expected-height="10" data -expected-width="120">
90 <div class="firstRowFirstColumn margins">XX XX XX</div>
91 <div class="firstRowSecondColumn">XX XX XX</div>
92 </div>
93 <div class="grid gridFixedMinContent min-content" data-expected-height="10" data -expected-width="60">
94 <div class="firstRowFirstColumn">XXXXX XXXXX</div>
95 <div class="firstRowSecondColumn margins">XXXXX XXXXX</div>
96 </div>
97 <div class="grid gridFixedMinContent max-content" data-expected-height="10" data -expected-width="160">
98 <div class="firstRowFirstColumn margins">XXXXX XXXXX</div>
99 <div class="firstRowSecondColumn">XXXXX XXXXX</div>
100 </div>
101 <div class="grid gridFixedMaxContent min-content" data-expected-height="10" data -expected-width="80">
102 <div class="firstRowFirstColumn">XX XX XX</div>
103 <div class="firstRowSecondColumn margins">XX XX XX</div>
104 </div>
105 <div class="grid gridFixedMaxContent max-content" data-expected-height="10" data -expected-width="220">
106 <div class="firstRowFirstColumn margins">XX XX XX</div>
107 <div class="firstRowSecondColumn">XX XX XX</div>
108 </div>
109
80 </body> 110 </body>
81 </html> 111 </html>
OLDNEW
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698