Changeset 121611 in webkit
- Timestamp:
- Jun 29, 2012 7:36:41 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r121610 r121611 1 2012-06-29 Tony Chang <tony@chromium.org> 2 3 Allow align-self: stretch to cause the item size to shrink below its intrinsic size 4 https://bugs.webkit.org/show_bug.cgi?id=90304 5 6 Reviewed by Ojan Vafai. 7 8 * css3/flexbox/child-overflow-expected.html: 9 * css3/flexbox/child-overflow.html: 10 * css3/flexbox/flex-align-stretch.html: 11 1 12 2012-06-29 James Weatherall <wez@chromium.org> 2 13 -
trunk/LayoutTests/css3/flexbox/child-overflow-expected.html
r111214 r121611 30 30 </head> 31 31 <body> 32 <p>Scrollbars should work in all the flexboxes. The first and third 33 columns should overflow the logical height. Each row should be aligned 32 <p>Scrollbars should work in all the flexboxes. Each row should be aligned 34 33 to the same corner.</p> 35 34 36 <div class="container bottomLeft"><div style="height: auto; position: absolute; bottom: 0"><div></div></div></div>37 35 <div class="container bottomLeft"><div><div></div></div></div> 38 <div class="container bottomLeft"><div style="height: auto; position: absolute; bottom: 0"><div></div></div></div> 36 <div class="container bottomLeft"><div><div></div></div></div> 37 <div class="container bottomLeft"><div><div></div></div></div> 39 38 <div class="container bottomLeft"><div><div></div></div></div> 40 39 <br> 41 <div class="container topRight"><div style="width: auto; overflow-x: hidden; overflow-y: scroll; position: absolute; right: 0"><div></div></div></div>42 40 <div class="container topRight"><div><div></div></div></div> 43 <div class="container topRight"><div style="width: auto; overflow-x: hidden; overflow-y: scroll; position: absolute; right: 0"><div></div></div></div> 41 <div class="container topRight"><div><div></div></div></div> 42 <div class="container topRight"><div><div></div></div></div> 44 43 <div class="container topRight"><div><div></div></div></div> 45 44 <br> 46 <div class="container"><div style="width: auto; overflow-x: hidden; overflow-y: scroll; position: absolute;"><div></div></div></div>47 45 <div class="container"><div><div></div></div></div> 48 <div class="container"><div style="width: auto; overflow-x: hidden; overflow-y: scroll; position: absolute;"><div></div></div></div> 46 <div class="container"><div><div></div></div></div> 47 <div class="container"><div><div></div></div></div> 49 48 <div class="container"><div><div></div></div></div> 50 49 <br> 51 <div class="container"><div style="height: auto"><div></div></div></div>52 50 <div class="container"><div><div></div></div></div> 53 <div class="container"><div style="height: auto"><div></div></div></div> 51 <div class="container"><div><div></div></div></div> 52 <div class="container"><div><div></div></div></div> 54 53 <div class="container"><div><div></div></div></div> 55 54 -
trunk/LayoutTests/css3/flexbox/child-overflow.html
r117385 r121611 63 63 </head> 64 64 <body> 65 <p>Scrollbars should work in all the flexboxes. The first and third 66 columns should overflow the logical height. Each row should be aligned 65 <p>Scrollbars should work in all the flexboxes. Each row should be aligned 67 66 to the same corner.</p> 68 67 </body> -
trunk/LayoutTests/css3/flexbox/flex-align-stretch.html
r119990 r121611 83 83 </div> 84 84 85 <!-- When overflowing the height, align-items: stretch doesn't cause the flex item to get smaller. -->86 85 <div class="flexbox" style="height: 50px; width: 600px;"> 87 <div data-expected-height=" 60" style="background-color: yellow; width: 300px">86 <div data-expected-height="50" style="background-color: yellow; width: 300px"> 88 87 <div data-expected-height="60" style="height: 60px; width: 10px; background-color: orange"></div> 89 88 </div> 90 89 </div> 91 90 92 <!-- In the column case, the width of the flex item is constrained by the width of the flexbox, so align-items: stretch doesn't change the width. -->93 91 <div class="flexbox" style="-webkit-flex-direction: column; width: 100px;"> 94 92 <div data-expected-width="100" data-expected-height="50" style="background-color: yellow;"> -
trunk/Source/WebCore/ChangeLog
r121610 r121611 1 2012-06-29 Tony Chang <tony@chromium.org> 2 3 Allow align-self: stretch to cause the item size to shrink below its intrinsic size 4 https://bugs.webkit.org/show_bug.cgi?id=90304 5 6 Reviewed by Ojan Vafai. 7 8 The spec used to say that stretch could only make items grow, but now 9 it allows items to shrink. 10 http://dev.w3.org/csswg/css3-flexbox/#align-items-stretch 11 12 Tests: css3/flexbox/flex-align-stretch.html Updated expectations. 13 css3/flexbox/child-overflow.html Updated expectations. 14 15 * rendering/RenderFlexibleBox.cpp: 16 (WebCore::RenderFlexibleBox::applyStretchAlignmentToChild): 17 1 18 2012-06-29 James Weatherall <wez@chromium.org> 2 19 -
trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp
r121123 r121611 1199 1199 LayoutUnit logicalHeightBefore = child->logicalHeight(); 1200 1200 LayoutUnit stretchedLogicalHeight = child->logicalHeight() + availableAlignmentSpaceForChild(lineCrossAxisExtent, child); 1201 if (stretchedLogicalHeight < logicalHeightBefore)1202 return;1203 1201 1204 1202 child->setLogicalHeight(stretchedLogicalHeight);
Note: See TracChangeset
for help on using the changeset viewer.