| Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
|
| index ab7fda8b97f5c3aa4bc88b57c60f084cf067f2f7..33f4f3a3d714fd561abf46ed979538aacdc5a113 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
|
| @@ -2,12 +2,8 @@
|
| <html>
|
| <link href="resources/grid.css" rel="stylesheet">
|
| <style>
|
| -.gridMinFlexContent {
|
| - grid-template-columns: minmax(1fr, 50px);
|
| - grid-template-rows: 50px;
|
| -}
|
| -.gridZeroFlexContent {
|
| - grid-template-columns: minmax(1fr, 0px);
|
| +.gridFlexContent {
|
| + grid-template-columns: 1fr 1fr;
|
| grid-template-rows: 50px;
|
| }
|
| .gridMaxFlexContent {
|
| @@ -53,28 +49,10 @@
|
|
|
| <p>Test that resolving auto tracks on grid items works properly.</p>
|
|
|
| -<div style="width: 0px">
|
| - <div class="grid gridMinFlexContent">
|
| - <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="0" data-expected-height="50"></div>
|
| - </div>
|
| -</div>
|
| -
|
| -<div style="width: 100px">
|
| - <div class="grid gridZeroFlexContent">
|
| - <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="0" data-expected-height="50"></div>
|
| - </div>
|
| -</div>
|
| -
|
| -<!-- Allow the extra logical space distribution to occur. -->
|
| -<div style="width: 40px; height: 10px">
|
| - <div class="grid gridMinFlexContent">
|
| - <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="40" data-expected-height="50"></div>
|
| - </div>
|
| -</div>
|
| -
|
| -<div style="width: 100px; height: 10px;">
|
| - <div class="grid gridMinFlexContent">
|
| - <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div>
|
| +<div class="constrainedContainer" style="position: relative">
|
| + <div class="grid gridFlexContent">
|
| + <div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="30" data-expected-height="50">XXX</div>
|
| + <div class="sizedToGridArea firstRowSecondColumn" data-offset-x="30" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX</div>
|
| </div>
|
| </div>
|
|
|
|
|