Changeset 104645 in webkit

Timestamp:

Jan 10, 2012 3:52:56 PM (12 years ago)

Author:

tony@chromium.org

Message:

Need to handle absolutely positioned elements inside flexboxes
​https://bugs.webkit.org/show_bug.cgi?id=70793

Reviewed by David Hyatt.

Source/WebCore:

Tests: css3/flexbox/insert-text-crash.html

css3/flexbox/position-absolute-child.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computePreferredMainAxisExtent): Skip the size of positioned elements.
(WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithm): Add placeholders for positioned elements.
(WebCore::RenderFlexibleBox::prepareChildForPositionedLayout): Positions the layer for the positioned child.
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren): Handle positioned elements.
(WebCore::RenderFlexibleBox::layoutColumnReverse): Adjust the main axis offset of the layer for positioned elements.

• rendering/RenderFlexibleBox.h:

LayoutTests:

• css3/flexbox/insert-text-crash-expected.txt: Added.
• css3/flexbox/insert-text-crash.html: Added.
• css3/flexbox/position-absolute-child-expected.txt: Added.
• css3/flexbox/position-absolute-child.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/insert-text-crash-expected.txt (added)
• LayoutTests/css3/flexbox/insert-text-crash.html (added)
• LayoutTests/css3/flexbox/position-absolute-child-expected.txt (added)
• LayoutTests/css3/flexbox/position-absolute-child.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (6 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-10  Tony Chang  <tony@chromium.org>
+
+        Need to handle absolutely positioned elements inside flexboxes
+        https://bugs.webkit.org/show_bug.cgi?id=70793
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/insert-text-crash-expected.txt: Added.
+        * css3/flexbox/insert-text-crash.html: Added.
+        * css3/flexbox/position-absolute-child-expected.txt: Added.
+        * css3/flexbox/position-absolute-child.html: Added.
+
 2012-01-10  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-10  Tony Chang  <tony@chromium.org>
+
+        Need to handle absolutely positioned elements inside flexboxes
+        https://bugs.webkit.org/show_bug.cgi?id=70793
+
+        Reviewed by David Hyatt.
+
+        Tests: css3/flexbox/insert-text-crash.html
+               css3/flexbox/position-absolute-child.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::computePreferredMainAxisExtent): Skip the size of positioned elements.
+        (WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithm): Add placeholders for positioned elements.
+        (WebCore::RenderFlexibleBox::prepareChildForPositionedLayout): Positions the layer for the positioned child.
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildren): Handle positioned elements.
+        (WebCore::RenderFlexibleBox::layoutColumnReverse): Adjust the main axis offset of the layer for positioned elements.
+        * rendering/RenderFlexibleBox.h:
+
 2012-01-10  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -33 +33 @@
 
 #include "LayoutRepainter.h"
+#include "RenderLayer.h"
 #include "RenderView.h"
 
@@ -489 +490 @@
     LayoutUnit flexboxAvailableContentExtent = mainAxisContentExtent();
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
+        if (child->isPositioned())
+            continue;
+
         child->clearOverrideSize();
         if (mainAxisLengthForChild(child).isAuto()) {
@@ -524 +528 @@
     LayoutUnit flexboxAvailableContentExtent = mainAxisContentExtent();
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
+        if (child->isPositioned()) {
+            childSizes.append(0);
+            continue;
+        }
+
         LayoutUnit childPreferredSize;
         if (inflexibleItems.contains(child))
@@ -592 +601 @@
 }
 
+void RenderFlexibleBox::prepareChildForPositionedLayout(RenderBox* child, LayoutUnit mainAxisOffset, LayoutUnit crossAxisOffset)
+{
+    ASSERT(child->isPositioned());
+    child->containingBlock()->insertPositionedObject(child);
+    RenderLayer* childLayer = child->layer();
+    LayoutUnit inlinePosition = isColumnFlow() ? crossAxisOffset : mainAxisOffset;
+    if (style()->flexDirection() == FlowRowReverse)
+        inlinePosition = mainAxisExtent() - mainAxisOffset;
+    childLayer->setStaticInlinePosition(inlinePosition); // FIXME: Not right for regions.
+
+    LayoutUnit staticBlockPosition = isColumnFlow() ? mainAxisOffset : crossAxisOffset;
+    if (childLayer->staticBlockPosition() != staticBlockPosition) {
+        childLayer->setStaticBlockPosition(staticBlockPosition);
+        if (child->style()->hasStaticBlockPosition(style()->isHorizontalWritingMode()))
+            child->setChildNeedsLayout(true, false);
+    }
+}
+
 void RenderFlexibleBox::layoutAndPlaceChildren(FlexOrderIterator& iterator, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility)
 {
@@ -603 +630 @@
     size_t i = 0;
     for (RenderBox* child = iterator.first(); child; child = iterator.next(), ++i) {
+        if (child->isPositioned()) {
+            prepareChildForPositionedLayout(child, mainAxisOffset, crossAxisOffset);
+            mainAxisOffset += packingSpaceBetweenChildren(availableFreeSpace, totalPositiveFlexibility, style()->flexPack(), childSizes.size());
+            continue;
+        }
         LayoutUnit childPreferredSize = childSizes[i] + mainAxisBorderAndPaddingExtentForChild(child);
         setLogicalOverrideSize(child, childPreferredSize);
@@ -658 +690 @@
     size_t i = 0;
     for (RenderBox* child = iterator.first(); child; child = iterator.next(), ++i) {
+        if (child->isPositioned()) {
+            child->layer()->setStaticBlockPosition(mainAxisOffset);
+            mainAxisOffset -= packingSpaceBetweenChildren(availableFreeSpace, totalPositiveFlexibility, style()->flexPack(), childSizes.size());
+            continue;
+        }
         mainAxisOffset -= mainAxisExtentForChild(child) + flowAwareMarginEndForChild(child);
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -97 +97 @@
     bool runFreeSpaceAllocationAlgorithm(FlexOrderIterator&, LayoutUnit& availableFreeSpace, float& totalPositiveFlexibility, float& totalNegativeFlexibility, InflexibleFlexItemSize&, WTF::Vector<LayoutUnit>& childSizes);
     void setLogicalOverrideSize(RenderBox* child, LayoutUnit childPreferredSize);
+    void prepareChildForPositionedLayout(RenderBox* child, LayoutUnit mainAxisOffset, LayoutUnit crossAxisOffset);
     void layoutAndPlaceChildren(FlexOrderIterator&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility);
     void layoutColumnReverse(FlexOrderIterator&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility);