Changeset 124064 in webkit

Timestamp:

Jul 30, 2012 11:39:53 AM (12 years ago)

Author:

tony@chromium.org

Message:

new flexbox should ignore float set on flexitems
​https://bugs.webkit.org/show_bug.cgi?id=70792

Reviewed by Ojan Vafai.

Source/WebCore:

Force flex items to not float.

Test: css3/flexbox/floated-flexitem.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::adjustRenderStyle): Force NoFloat on flex items.

LayoutTests:

Make an example in the spec into a ref test. Add some styles to make it a bit more clear what's happening.

• css3/flexbox/floated-flexitem-expected.html: Added.
• css3/flexbox/floated-flexitem.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/floated-flexitem-expected.html (added)
• LayoutTests/css3/flexbox/floated-flexitem.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-30  Tony Chang  <tony@chromium.org>
+
+        new flexbox should ignore float set on flexitems
+        https://bugs.webkit.org/show_bug.cgi?id=70792
+
+        Reviewed by Ojan Vafai.
+
+        Make an example in the spec into a ref test.  Add some styles to make it a bit more clear what's happening.
+
+        * css3/flexbox/floated-flexitem-expected.html: Added.
+        * css3/flexbox/floated-flexitem.html: Added.
+
 2012-07-30  Peter Kasting  <pkasting@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-30  Tony Chang  <tony@chromium.org>
+
+        new flexbox should ignore float set on flexitems
+        https://bugs.webkit.org/show_bug.cgi?id=70792
+
+        Reviewed by Ojan Vafai.
+
+        Force flex items to not float.
+
+        Test: css3/flexbox/floated-flexitem.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::adjustRenderStyle): Force NoFloat on flex items.
+
 2012-07-30  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2144 +2144 @@
             style->setWritingMode(TopToBottomWritingMode);
 
-        if (e && e->parentNode() && e->parentNode()->renderer() && e->parentNode()->renderer()->isFlexibleBox())
+        if (e && e->parentNode() && e->parentNode()->renderer() && e->parentNode()->renderer()->isFlexibleBox()) {
+            style->setFloating(NoFloat);
             style->setDisplay(equivalentBlockDisplay(style->display(), style->isFloating(), m_checker.strictParsing()));
+        }
     }