Chromium Code Reviews| Index: third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html |
| diff --git a/third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html b/third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html |
| index cb98aad51ab73ee5786190e926bf29be15a0234b..eccdf7db094780736f8d8f0030406a7549d40e1f 100644 |
| --- a/third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html |
| +++ b/third_party/WebKit/LayoutTests/css3/flexbox/nested-flexbox-min-size-auto.html |
| @@ -1,15 +1,46 @@ |
| <!DOCTYPE html> |
| + |
| <link href="resources/flexbox.css" rel="stylesheet"> |
| <script src="../../resources/testharness.js"></script> |
| <script src="../../resources/testharnessreport.js"></script> |
| <script src="../../resources/check-layout-th.js"></script> |
| -<body onload="checkLayout('.flexbox')"> |
| -<div id=log></div> |
| +<style> |
| +.height-100pct { |
| + height: 100%; |
| +} |
| + |
| +#container { |
| + height: 300px; |
| + outline: 2px solid black; |
| +} |
| -<!-- This isn't "correct" per the spec, but it is an interim fix |
| - to avoid bad results. |
| - See https://crbug.com/580196 |
| - --> |
| -<div class="flexbox column" style="height: 0px;" data-expected-height="0"> |
| - <div data-expected-height="0" style="display: flex;">Some text</div> |
| +.inner |
| +{ |
| + width: 400px; |
| + flex: 1; |
| + background-color: green; |
| +} |
| +</style> |
| +<script> |
| +function change() { |
| + var container = document.getElementById('container'); |
| + container.offsetHeight; |
| + container.style.height='100px'; |
| + checkLayout('#container'); |
| +} |
| +</script> |
| +<body onload="change()"> |
| +<p>Green rectangle should be entirely within the black rectangle</p> |
| +<div id="log"></div> |
| +<div id="container"> |
| + <div class="flexbox column height-100pct"> |
|
eae
2016/07/18 22:14:07
style="height: 100%;" instead of trying to encode
cbiesinger
2016/07/18 22:17:09
Done.
|
| + <div class="flexbox flex-one"> |
| + <div class="flexbox column"> |
| + <div class="flexbox column flex-one"> |
| + <div class="inner" data-expected-height="100"> |
|
eae
2016/07/18 22:14:07
You might want to use a different number than 100
cbiesinger
2016/07/18 22:17:09
Done.
|
| + </div> |
| + </div> |
| + </div> |
| + </div> |
| + </div> |
| </div> |