Title: [107112] trunk
- Revision
- 107112
- Author
- o...@chromium.org
- Date
- 2012-02-08 11:58:35 -0800 (Wed, 08 Feb 2012)
Log Message
Floated flexboxes render as regular RenderBlocks
https://bugs.webkit.org/show_bug.cgi?id=77909
Reviewed by Eric Seidel.
Source/WebCore:
Add grid/flexbox cases to adjusting the display of floated/positioned
elements. Also, move this logic into a switch statement. This makes
the code more readable and gives compile warnings when new display types
are added that aren't handled here.
Test: css3/flexbox/floated-flexbox.html
* css/CSSStyleSelector.cpp:
(WebCore::adjustDisplay):
(WebCore):
(WebCore::CSSStyleSelector::adjustRenderStyle):
LayoutTests:
* css3/flexbox/floated-flexbox-expected.txt: Added.
* css3/flexbox/floated-flexbox.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (107111 => 107112)
--- trunk/LayoutTests/ChangeLog 2012-02-08 19:44:55 UTC (rev 107111)
+++ trunk/LayoutTests/ChangeLog 2012-02-08 19:58:35 UTC (rev 107112)
@@ -1,3 +1,13 @@
+2012-02-07 Ojan Vafai <o...@chromium.org>
+
+ Floated flexboxes render as regular RenderBlocks
+ https://bugs.webkit.org/show_bug.cgi?id=77909
+
+ Reviewed by Eric Seidel.
+
+ * css3/flexbox/floated-flexbox-expected.txt: Added.
+ * css3/flexbox/floated-flexbox.html: Added.
+
2012-02-08 Julien Chaffraix <jchaffr...@webkit.org>
Unreviewed gardening.
Added: trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt (0 => 107112)
--- trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt 2012-02-08 19:58:35 UTC (rev 107112)
@@ -0,0 +1,7 @@
+FAIL:
+Expected 130 for width, but got 110.
+
+<div data-expected-width="130" data-expected-height="30" class="flexbox">
+ <div style="background-color:pink; width: 20px; height: 20px;"></div>
+ <div style="background-color:red; width: 100px; height: 20px;"></div>
+</div>
Property changes on: trunk/LayoutTests/css3/flexbox/floated-flexbox-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/css3/flexbox/floated-flexbox.html (0 => 107112)
--- trunk/LayoutTests/css3/flexbox/floated-flexbox.html (rev 0)
+++ trunk/LayoutTests/css3/flexbox/floated-flexbox.html 2012-02-08 19:58:35 UTC (rev 107112)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<style>
+.flexbox {
+ display: -webkit-flexbox;
+ background-color: #aaa;
+ border: 5px solid blue;
+ float:left;
+}
+.flexbox :nth-child(1) {
+ background-color: blue;
+}
+.flexbox :nth-child(2) {
+ background-color: green;
+}
+</style>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+<script src=""
+<body _onload_="checkFlexBoxen()">
+
+<div data-expected-width=130 data-expected-height=30 class=flexbox>
+ <div style="background-color:pink; width: 20px; height: 20px;"></div>
+ <div style="background-color:red; width: 100px; height: 20px;"></div>
+</div>
+
+</body>
+</html>
Property changes on: trunk/LayoutTests/css3/flexbox/floated-flexbox.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (107111 => 107112)
--- trunk/Source/WebCore/ChangeLog 2012-02-08 19:44:55 UTC (rev 107111)
+++ trunk/Source/WebCore/ChangeLog 2012-02-08 19:58:35 UTC (rev 107112)
@@ -1,3 +1,22 @@
+2012-02-07 Ojan Vafai <o...@chromium.org>
+
+ Floated flexboxes render as regular RenderBlocks
+ https://bugs.webkit.org/show_bug.cgi?id=77909
+
+ Reviewed by Eric Seidel.
+
+ Add grid/flexbox cases to adjusting the display of floated/positioned
+ elements. Also, move this logic into a switch statement. This makes
+ the code more readable and gives compile warnings when new display types
+ are added that aren't handled here.
+
+ Test: css3/flexbox/floated-flexbox.html
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::adjustDisplay):
+ (WebCore):
+ (WebCore::CSSStyleSelector::adjustRenderStyle):
+
2012-02-08 Dirk Schulze <k...@webkit.org>
viewBox on nested SVG causes wrong content size for relative values
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (107111 => 107112)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-02-08 19:44:55 UTC (rev 107111)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-02-08 19:58:35 UTC (rev 107112)
@@ -1727,6 +1727,55 @@
}
}
+static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool strictParsing)
+{
+ switch (display) {
+ case BLOCK:
+ case TABLE:
+ case BOX:
+ case FLEXBOX:
+#if ENABLE(CSS_GRID_LAYOUT)
+ case GRID:
+#endif
+ return display;
+
+ case LIST_ITEM:
+ // It is a WinIE bug that floated list items lose their bullets, so we'll emulate the quirk, but only in quirks mode.
+ if (!strictParsing && isFloating)
+ return BLOCK;
+ return display;
+ case INLINE_TABLE:
+ return TABLE;
+ case INLINE_BOX:
+ return BOX;
+ case INLINE_FLEXBOX:
+ return FLEXBOX;
+#if ENABLE(CSS_GRID_LAYOUT)
+ case INLINE_GRID:
+ return GRID;
+#endif
+
+ case INLINE:
+ case RUN_IN:
+ case COMPACT:
+ case INLINE_BLOCK:
+ case TABLE_ROW_GROUP:
+ case TABLE_HEADER_GROUP:
+ case TABLE_FOOTER_GROUP:
+ case TABLE_ROW:
+ case TABLE_COLUMN_GROUP:
+ case TABLE_COLUMN:
+ case TABLE_CELL:
+ case TABLE_CAPTION:
+ return BLOCK;
+ case NONE:
+ ASSERT_NOT_REACHED();
+ return NONE;
+ }
+ ASSERT_NOT_REACHED();
+ return BLOCK;
+}
+
void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e)
{
// Cache our original display.
@@ -1776,26 +1825,9 @@
if (e && e->hasTagName(legendTag))
style->setDisplay(BLOCK);
- // Mutate the display to BLOCK or TABLE for certain cases, e.g., if someone attempts to
- // position or float an inline, compact, or run-in. Cache the original display, since it
- // may be needed for positioned elements that have to compute their static normal flow
- // positions. We also force inline-level roots to be block-level.
- if (style->display() != BLOCK && style->display() != TABLE && style->display() != BOX &&
- (style->position() == AbsolutePosition || style->position() == FixedPosition || style->isFloating() ||
- (e && e->document()->documentElement() == e))) {
- if (style->display() == INLINE_TABLE)
- style->setDisplay(TABLE);
- else if (style->display() == INLINE_BOX)
- style->setDisplay(BOX);
- else if (style->display() == LIST_ITEM) {
- // It is a WinIE bug that floated list items lose their bullets, so we'll emulate the quirk,
- // but only in quirks mode.
- if (!m_checker.strictParsing() && style->isFloating())
- style->setDisplay(BLOCK);
- }
- else
- style->setDisplay(BLOCK);
- }
+ // Absolute/fixed positioned elements, floating elements and the document element need block-like outside display.
+ if (style->position() == AbsolutePosition || style->position() == FixedPosition || style->isFloating() || (e && e->document()->documentElement() == e))
+ style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloating(), m_checker.strictParsing()));
// FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely
// clear how that should work.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
