Changeset 132164 in webkit

Timestamp:

Oct 22, 2012 5:03:56 PM (12 years ago)

Author:

tony@chromium.org

Message:

margin-top/bottom has no effect for child nodes of flex items
​https://bugs.webkit.org/show_bug.cgi?id=99923

Reviewed by Ojan Vafai.

Source/WebCore:

Flexitems, like table cells, shouldn't collapse margins.

Test: css3/flexbox/flexitem-no-margin-collapsing.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::MarginInfo::MarginInfo): Check to see if the parent is a flexible box.
We should always have a parent if we make it this far in the check.

LayoutTests:

Add a test to make sure we don't collapse margins in flex items.

• css3/flexbox/flexitem-no-margin-collapsing-expected.txt: Added.
• css3/flexbox/flexitem-no-margin-collapsing.html: Added.
• css3/flexbox/repaint.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flexitem-no-margin-collapsing-expected.txt (added)
• LayoutTests/css3/flexbox/flexitem-no-margin-collapsing.html (added)
• LayoutTests/css3/flexbox/repaint.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-22  Tony Chang  <tony@chromium.org>
+
+        margin-top/bottom has no effect for child nodes of flex items
+        https://bugs.webkit.org/show_bug.cgi?id=99923
+
+        Reviewed by Ojan Vafai.
+
+        Add a test to make sure we don't collapse margins in flex items.
+
+        * css3/flexbox/flexitem-no-margin-collapsing-expected.txt: Added.
+        * css3/flexbox/flexitem-no-margin-collapsing.html: Added.
+        * css3/flexbox/repaint.html:
+
 2012-10-22  Emil A Eklund  <eae@chromium.org>
 

trunk/LayoutTests/css3/flexbox/repaint.html

@@ -58 +58 @@
 <div id="left"></div>
 <div id="content">
-<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.</p>
+<p style="margin: 0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.</p>
 </div>
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-22  Tony Chang  <tony@chromium.org>
+
+        margin-top/bottom has no effect for child nodes of flex items
+        https://bugs.webkit.org/show_bug.cgi?id=99923
+
+        Reviewed by Ojan Vafai.
+
+        Flexitems, like table cells, shouldn't collapse margins.
+
+        Test: css3/flexbox/flexitem-no-margin-collapsing.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::MarginInfo::MarginInfo): Check to see if the parent is a flexible box.
+        We should always have a parent if we make it this far in the check.
+
 2012-10-22  Marja Hölttä  <marja@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -162 +162 @@
     , m_determinedMarginBeforeQuirk(false)
 {
-    // Whether or not we can collapse our own margins with our children.  We don't do this
-    // if we had any border/padding (obviously), if we're the root or HTML elements, or if
-    // we're positioned, floating, a table cell.
     RenderStyle* blockStyle = block->style();
+    ASSERT(block->isRenderView() || block->parent());
     m_canCollapseWithChildren = !block->isRenderView() && !block->isRoot() && !block->isOutOfFlowPositioned()
         && !block->isFloating() && !block->isTableCell() && !block->hasOverflowClip() && !block->isInlineBlockOrInlineTable()
-        && !block->isWritingModeRoot() && blockStyle->hasAutoColumnCount() && blockStyle->hasAutoColumnWidth()
+        && !block->isWritingModeRoot() && !block->parent()->isFlexibleBox() && blockStyle->hasAutoColumnCount() && blockStyle->hasAutoColumnWidth()
         && !blockStyle->columnSpan();