Changeset 169639 in webkit

Timestamp:

Jun 5, 2014 11:44:55 PM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions] Region box incorrectly overlaps floating box
​https://bugs.webkit.org/show_bug.cgi?id=133545

Reviewed by David Hyatt.

Source/WebCore:
A region box creates a BFC and it should not overlap a floating box in the same formatting context: ​http://www.w3.org/TR/CSS21/visuren.html#bfc-next-to-float

Test: fast/regions/region-as-bfc-avoids-float.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::avoidsFloats):

LayoutTests:
Add test to check that a region does not incorrectly overlap a floating
element in the same formatting context.

• fast/regions/region-as-bfc-avoids-float-expected.html: Added.
• fast/regions/region-as-bfc-avoids-float.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/region-as-bfc-avoids-float-expected.html (added)
• LayoutTests/fast/regions/region-as-bfc-avoids-float.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-06-05  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Region box incorrectly overlaps floating box
+        https://bugs.webkit.org/show_bug.cgi?id=133545
+
+        Reviewed by David Hyatt.
+
+        Add test to check that a region does not incorrectly overlap a floating
+        element in the same formatting context.
+
+        * fast/regions/region-as-bfc-avoids-float-expected.html: Added.
+        * fast/regions/region-as-bfc-avoids-float.html: Added.
+
 2014-06-05  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-05  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Region box incorrectly overlaps floating box
+        https://bugs.webkit.org/show_bug.cgi?id=133545
+
+        Reviewed by David Hyatt.
+
+        A region box creates a BFC and it should not overlap a floating box in the same formatting context: http://www.w3.org/TR/CSS21/visuren.html#bfc-next-to-float
+
+        Test: fast/regions/region-as-bfc-avoids-float.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::avoidsFloats):
+
 2014-06-05  Yoav Weiss  <yoav@yoav.ws>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2468 +2468 @@
 {
     // Floats can't intrude into our box if we have a non-auto column count or width.
-    return RenderBox::avoidsFloats() || !style().hasAutoColumnCount() || !style().hasAutoColumnWidth();
+    return RenderBox::avoidsFloats()
+        || !style().hasAutoColumnCount()
+        || !style().hasAutoColumnWidth()
+        || style().hasFlowFrom();
 }