Title: [124279] trunk
- Revision
- 124279
- Author
- [email protected]
- Date
- 2012-07-31 18:31:27 -0700 (Tue, 31 Jul 2012)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (124278 => 124279)
--- trunk/LayoutTests/ChangeLog 2012-08-01 00:54:19 UTC (rev 124278)
+++ trunk/LayoutTests/ChangeLog 2012-08-01 01:31:27 UTC (rev 124279)
@@ -1,5 +1,16 @@
2012-07-31 Tony Chang <[email protected]>
+ 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 <[email protected]>
+
REGRESSION: flexbox content-size fails to exclude scrollbar
https://bugs.webkit.org/show_bug.cgi?id=92667
Modified: trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt (124278 => 124279)
--- trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt 2012-08-01 00:54:19 UTC (rev 124278)
+++ trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt 2012-08-01 01:31:27 UTC (rev 124279)
@@ -1 +1,2 @@
PASS
+PASS
Modified: trunk/LayoutTests/css3/flexbox/floated-flexbox.html (124278 => 124279)
--- trunk/LayoutTests/css3/flexbox/floated-flexbox.html 2012-08-01 00:54:19 UTC (rev 124278)
+++ trunk/LayoutTests/css3/flexbox/floated-flexbox.html 2012-08-01 01:31:27 UTC (rev 124279)
@@ -8,10 +8,10 @@
float:left;
}
.flexbox :nth-child(1) {
- background-color: blue;
+ background-color: salmon;
}
.flexbox :nth-child(2) {
- background-color: green;
+ background-color: lime;
}
</style>
<script>
@@ -26,5 +26,13 @@
<div style="background-color:red; width: 100px; height: 20px;"></div>
</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>
Modified: trunk/Source/WebCore/ChangeLog (124278 => 124279)
--- trunk/Source/WebCore/ChangeLog 2012-08-01 00:54:19 UTC (rev 124278)
+++ trunk/Source/WebCore/ChangeLog 2012-08-01 01:31:27 UTC (rev 124279)
@@ -1,5 +1,18 @@
2012-07-31 Tony Chang <[email protected]>
+ 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 <[email protected]>
+
REGRESSION: flexbox content-size fails to exclude scrollbar
https://bugs.webkit.org/show_bug.cgi?id=92667
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (124278 => 124279)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2012-08-01 00:54:19 UTC (rev 124278)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2012-08-01 01:31:27 UTC (rev 124279)
@@ -44,6 +44,7 @@
virtual const char* renderName() const OVERRIDE;
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
