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 4ce33535400ff1742f6ef31e40a8bf5ce49be95b..ab7fda8b97f5c3aa4bc88b57c60f084cf067f2f7 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 |
@@ -6,6 +6,10 @@ |
grid-template-columns: minmax(1fr, 50px); |
grid-template-rows: 50px; |
} |
+.gridZeroFlexContent { |
+ grid-template-columns: minmax(1fr, 0px); |
+ grid-template-rows: 50px; |
+} |
.gridMaxFlexContent { |
grid-template-columns: minmax(30px, 2fr); |
grid-template-rows: 50px; |
@@ -22,6 +26,27 @@ |
grid-template-columns: minmax(300px, 3fr) minmax(150px, 1fr); |
grid-template-rows: 50px; |
} |
+.gridRespectBaseSize { |
+ grid-template-columns: minmax(75px, 1fr) minmax(0px, 2fr); |
+ grid-template-rows: 50px; |
+} |
+.gridRespectProportions { |
+ grid-template-columns: minmax(0px, .25fr) minmax(0px, .5fr) minmax(0px, 2fr); |
+ grid-template-rows: 50px; |
+} |
+.gridRespectBaseSizeProportions { |
+ grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr); |
+ grid-template-rows: 50px; |
+} |
+.gridRespectBaseSizeBeforeProportions { |
+ grid-template-columns: minmax(50px, .25fr) minmax(0px, .5fr) minmax(0px, 1fr); |
+ grid-template-rows: 50px; |
+} |
+.firstRowThirdColumn { |
+ background-color: yellow; |
+ grid-column: 3; |
+ grid-row: 1; |
+} |
</style> |
<script src="../../resources/check-layout.js"></script> |
<body onload="checkLayout('.grid');"> |
@@ -34,6 +59,12 @@ |
</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"> |
@@ -121,5 +152,40 @@ |
</div> |
</div> |
+<!-- Flex track length must be at least its baseSize. --> |
+<div style="width: 100px; height: 10px;"> |
+ <div class="grid gridRespectBaseSize"> |
+ <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="75" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="25" data-expected-height="50"></div> |
+ </div> |
+</div> |
+ |
+<!-- Flex track lengths must be proportional to their flex factors.. --> |
+<div style="width: 275px; height: 10px;"> |
+ <div class="grid gridRespectProportions"> |
+ <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="25" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="50" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="200" data-expected-height="50"></div> |
+ </div> |
+</div> |
+ |
+<!-- Flex track lengths must be proportional but still respecting their base sizes. --> |
+<div style="width: 350px; height: 10px;"> |
+ <div class="grid gridRespectBaseSizeProportions"> |
+ <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="100" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="200" data-expected-height="50"></div> |
+ </div> |
+</div> |
+ |
+<!-- Not enough space to respect proportions, because minTrackBreadh it's a harder requirement --> |
+<div style="width: 275px; height: 10px;"> |
+ <div class="grid gridRespectBaseSizeBeforeProportions"> |
+ <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="75" data-expected-height="50"></div> |
+ <div class="sizedToGridArea firstRowThirdColumn" data-expected-width="150" data-expected-height="50"></div> |
+ </div> |
+</div> |
+ |
</body> |
</html> |