Changeset 124064 in webkit
- Timestamp:
- Jul 30, 2012 11:39:53 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r124061 r124064 1 2012-07-30 Tony Chang <tony@chromium.org> 2 3 new flexbox should ignore float set on flexitems 4 https://bugs.webkit.org/show_bug.cgi?id=70792 5 6 Reviewed by Ojan Vafai. 7 8 Make an example in the spec into a ref test. Add some styles to make it a bit more clear what's happening. 9 10 * css3/flexbox/floated-flexitem-expected.html: Added. 11 * css3/flexbox/floated-flexitem.html: Added. 12 1 13 2012-07-30 Peter Kasting <pkasting@google.com> 2 14 -
trunk/Source/WebCore/ChangeLog
r124052 r124064 1 2012-07-30 Tony Chang <tony@chromium.org> 2 3 new flexbox should ignore float set on flexitems 4 https://bugs.webkit.org/show_bug.cgi?id=70792 5 6 Reviewed by Ojan Vafai. 7 8 Force flex items to not float. 9 10 Test: css3/flexbox/floated-flexitem.html 11 12 * css/StyleResolver.cpp: 13 (WebCore::StyleResolver::adjustRenderStyle): Force NoFloat on flex items. 14 1 15 2012-07-30 Adrienne Walker <enne@google.com> 2 16 -
trunk/Source/WebCore/css/StyleResolver.cpp
r123730 r124064 2144 2144 style->setWritingMode(TopToBottomWritingMode); 2145 2145 2146 if (e && e->parentNode() && e->parentNode()->renderer() && e->parentNode()->renderer()->isFlexibleBox()) 2146 if (e && e->parentNode() && e->parentNode()->renderer() && e->parentNode()->renderer()->isFlexibleBox()) { 2147 style->setFloating(NoFloat); 2147 2148 style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloating(), m_checker.strictParsing())); 2149 } 2148 2150 } 2149 2151
Note: See TracChangeset
for help on using the changeset viewer.