Changeset 124279 in webkit

Timestamp:

Jul 31, 2012 6:31:27 PM (12 years ago)

Author:

tony@chromium.org

Message:

flexbox should avoid floats
​https://bugs.webkit.org/show_bug.cgi?id=92661

Reviewed by Ojan Vafai.

Source/WebCore:

Block types should avoid floats. Deprecated flexbox and grid already avoid floats.

Tests: css3/flexbox/floated-flexbox.html - added a test case.

• rendering/RenderFlexibleBox.h:

LayoutTests:

Add a test case to make sure flexboxen avoid floats.

• css3/flexbox/floated-flexbox.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/floated-flexbox-expected.txt (modified) (1 diff)
• LayoutTests/css3/flexbox/floated-flexbox.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-31  Tony Chang  <tony@chromium.org>
+
+        flexbox should avoid floats
+        https://bugs.webkit.org/show_bug.cgi?id=92661
+
+        Reviewed by Ojan Vafai.
+
+        Add a test case to make sure flexboxen avoid floats.
+
+        * css3/flexbox/floated-flexbox.html:
+
 2012-07-31  Tony Chang  <tony@chromium.org>
 

trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt

@@ -1 +1 @@
 PASS
+PASS

trunk/LayoutTests/css3/flexbox/floated-flexbox.html

@@ -9 +9 @@
 }
 .flexbox :nth-child(1) {
-    background-color: blue;
+    background-color: salmon;
 }
 .flexbox :nth-child(2) {
-    background-color: green;
+    background-color: lime;
 }
 </style>
@@ -27 +27 @@
 </div>
 
+<div style="clear: left; position: relative">
+    <div style="width: 100px; height: 100px; background-color: green; float: left"></div>
+    <div data-expected-height=30 data-offset-x=100 data-offset-y=0 class="flexbox" style="float: none">
+        <div data-expected-height=20 data style="height: 20px; -webkit-flex: 1"></div>
+        <div data-expected-height=20 style="height: 20px; -webkit-flex: 1"></div>
+    </div>
+</div>
+
 </body>
 </html>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-31  Tony Chang  <tony@chromium.org>
+
+        flexbox should avoid floats
+        https://bugs.webkit.org/show_bug.cgi?id=92661
+
+        Reviewed by Ojan Vafai.
+
+        Block types should avoid floats. Deprecated flexbox and grid already avoid floats.
+
+        Tests: css3/flexbox/floated-flexbox.html - added a test case.
+
+        * rendering/RenderFlexibleBox.h:
+
 2012-07-31  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -45 +45 @@
 
     virtual bool isFlexibleBox() const OVERRIDE { return true; }
+    virtual bool avoidsFloats() const OVERRIDE { return true; }
     virtual void computePreferredLogicalWidths() OVERRIDE;
     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE;