| Index: LayoutTests/css3/flexbox/columns-auto-size.html
|
| diff --git a/LayoutTests/css3/flexbox/columns-auto-size.html b/LayoutTests/css3/flexbox/columns-auto-size.html
|
| index 60060d627b1397f728eaab15612ac415b3928d88..f8cd6d287b70a4dea3dc23550de45e1ca2bd05ae 100644
|
| --- a/LayoutTests/css3/flexbox/columns-auto-size.html
|
| +++ b/LayoutTests/css3/flexbox/columns-auto-size.html
|
| @@ -44,21 +44,21 @@ body {
|
| <script src="../../resources/check-layout.js"></script>
|
| <body onload="checkLayout('.flexbox')">
|
| <div class="flexbox column horizontal">
|
| - <div data-expected-height="10" data-offset-y="0" style="-webkit-flex: 1 0 10px; -moz-flex: 1 0 10px"></div>
|
| + <div data-expected-height="10" data-offset-y="0" style="flex: 1 0 10px; -moz-flex: 1 0 10px"></div>
|
| <div data-expected-height="10" data-offset-y="10" style="height: 10px;"></div>
|
| <div data-expected-height="10" data-offset-y="20"><div data-expected-height="10" data-offset-y="20" style="height: 10px"></div></div>
|
| </div>
|
|
|
| <!-- The last div is sized to 0 because there is no available space, however its child overflows. -->
|
| <div class="flexbox column horizontal">
|
| - <div data-expected-height="0" data-offset-y="0" style="-webkit-flex: 1; -moz-flex: 1"></div>
|
| + <div data-expected-height="0" data-offset-y="0" style="flex: 1; -moz-flex: 1"></div>
|
| <div data-expected-height="10" data-offset-y="0" style="height: 10px;"></div>
|
| - <div data-expected-height="10" data-offset-y="10" style="-webkit-flex: 1 auto; -moz-flex: 1 auto"><div style="height: 10px"></div></div>
|
| - <div data-expected-height="10" data-offset-y="20" style="min-height: 0; -webkit-flex: 1; -moz-flex: 1"><div data-expected-height="10" data-offset-y="20" class="child-div" style="height: 10px"></div></div>
|
| + <div data-expected-height="10" data-offset-y="10" style="flex: 1 auto; -moz-flex: 1 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="10" data-offset-y="20" style="min-height: 0; flex: 1; -moz-flex: 1"><div data-expected-height="10" data-offset-y="20" class="child-div" style="height: 10px"></div></div>
|
| </div>
|
|
|
| <div class="flexbox column horizontal">
|
| - <div data-expected-height="10" data-offset-y="10" style="-webkit-flex: 1 0 10px; -moz-flex: 1 0 10px; margin-top: 10px;"></div>
|
| + <div data-expected-height="10" data-offset-y="10" style="flex: 1 0 10px; -moz-flex: 1 0 10px; margin-top: 10px;"></div>
|
| <div data-expected-height="10" data-offset-y="20" style="height: 10px; margin-bottom: 20px;"></div>
|
| <div data-expected-height="20" data-offset-y="50" style="padding-top: 10px"><div data-expected-height="10" data-offset-y="60" style="height: 10px"></div></div>
|
| </div>
|
| @@ -66,29 +66,29 @@ body {
|
| <!-- Same as previous test case but with a justify-content set. Since there's no
|
| available space, it should layout the same. -->
|
| <div class="flexbox column horizontal justify-content-space-between">
|
| - <div data-expected-height="10" data-offset-y="10" style="-webkit-flex: 1 0 10px; -moz-flex: 1 0 10px; margin-top: 10px;"></div>
|
| + <div data-expected-height="10" data-offset-y="10" style="flex: 1 0 10px; -moz-flex: 1 0 10px; margin-top: 10px;"></div>
|
| <div data-expected-height="10" data-offset-y="20" style="height: 10px; margin-bottom: 20px;"></div>
|
| <div data-expected-height="20" data-offset-y="50" style="padding-top: 10px"><div data-expected-height="10" data-offset-y="60" style="height: 10px"></div></div>
|
| </div>
|
|
|
| <div class="flexbox column horizontal" data-expected-height="20">
|
| - <div data-expected-height="10" data-offset-y="0" style="-webkit-flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 10px"></div></div>
|
| - <div data-expected-height="10" data-offset-y="10" style="-webkit-flex: 0 2 auto; -moz-flex: 0 2 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="10" data-offset-y="0" style="flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="10" data-offset-y="10" style="flex: 0 2 auto; -moz-flex: 0 2 auto"><div style="height: 10px"></div></div>
|
| </div>
|
|
|
| <div class="flexbox column horizontal" style="min-height: 10px" data-expected-height="20">
|
| - <div data-expected-height="10" data-offset-y="0" style="-webkit-flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 10px"></div></div>
|
| - <div data-expected-height="10" data-offset-y="10" style="-webkit-flex: 0 2 auto; -moz-flex: 0 2 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="10" data-offset-y="0" style="flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="10" data-offset-y="10" style="flex: 0 2 auto; -moz-flex: 0 2 auto"><div style="height: 10px"></div></div>
|
| </div>
|
|
|
| <div class="flexbox column horizontal" style="min-height: 5px; max-height: 17px;" data-expected-height="17">
|
| - <div data-expected-height="9" data-offset-y="0" style="min-height: 0; -webkit-flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 10px"></div></div>
|
| - <div data-expected-height="8" data-offset-y="9" style="min-height: 0; -webkit-flex: 0 2 auto; -moz-flex: 0 2 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="9" data-offset-y="0" style="min-height: 0; flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 10px"></div></div>
|
| + <div data-expected-height="8" data-offset-y="9" style="min-height: 0; flex: 0 2 auto; -moz-flex: 0 2 auto"><div style="height: 10px"></div></div>
|
| </div>
|
|
|
| <div class="flexbox column horizontal" style="min-height: 5px; max-height: 30px; padding-top: 1px; padding-bottom: 2px;" data-expected-height="33">
|
| - <div data-expected-height="15" data-offset-y="1" style="min-height: 0; -webkit-flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 20px"></div></div>
|
| - <div data-expected-height="15" data-offset-y="16" style="min-height: 0; -webkit-flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 20px"></div></div>
|
| + <div data-expected-height="15" data-offset-y="1" style="min-height: 0; flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 20px"></div></div>
|
| + <div data-expected-height="15" data-offset-y="16" style="min-height: 0; flex: 0 1 auto; -moz-flex: 0 1 auto"><div style="height: 20px"></div></div>
|
| </div>
|
|
|
| <div class="flexbox column horizontal">
|
| @@ -96,17 +96,17 @@ body {
|
| </div>
|
|
|
| <div class="flexbox column vertical">
|
| - <div data-expected-width="10" data-offset-x="20" style="-webkit-flex: 1 0 10px; -moz-flex: 1 0 10px"></div>
|
| + <div data-expected-width="10" data-offset-x="20" style="flex: 1 0 10px; -moz-flex: 1 0 10px"></div>
|
| <div data-expected-width="10" data-offset-x="10" style="width: 10px;"></div>
|
| <div data-expected-width="10" data-offset-x="0"><div data-expected-width="10" data-offset-x="0" style="width: 10px"></div></div>
|
| </div>
|
|
|
| <!-- The first div overflows to the left, so give it a margin-left so we can see box it paints. -->
|
| <div class="flexbox column vertical" style="margin-left: 100px;">
|
| - <div data-expected-width="50" data-offset-x="20" style="min-width: 0; -webkit-flex: 1; -moz-flex: 1"><div data-expected-width="50" data-offset-x="20" class="child-div" style="width: 50px"></div></div>
|
| - <div data-expected-width="0" data-offset-x="20" style="-webkit-flex: 1; -moz-flex: 1"></div>
|
| + <div data-expected-width="50" data-offset-x="20" style="min-width: 0; flex: 1; -moz-flex: 1"><div data-expected-width="50" data-offset-x="20" class="child-div" style="width: 50px"></div></div>
|
| + <div data-expected-width="0" data-offset-x="20" style="flex: 1; -moz-flex: 1"></div>
|
| <div data-expected-width="10" data-offset-x="10" style="width: 10px;"></div>
|
| - <div data-expected-width="10" data-offset-x="0" style="-webkit-flex: 1 auto; -moz-flex: 1 auto"><div style="width: 10px"></div></div>
|
| + <div data-expected-width="10" data-offset-x="0" style="flex: 1 auto; -moz-flex: 1 auto"><div style="width: 10px"></div></div>
|
| </div>
|
|
|
| </body>
|
|
|