Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (231755 => 231756)
--- trunk/Source/WebCore/layout/FormattingContext.cpp 2018-05-14 14:39:18 UTC (rev 231755)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp 2018-05-14 14:52:50 UTC (rev 231756)
@@ -28,6 +28,7 @@
#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+#include "DisplayBox.h"
#include "LayoutBox.h"
#include "LayoutContainer.h"
#include "LayoutContext.h"
@@ -59,10 +60,10 @@
{
}
-void FormattingContext::computeWidth(const Box& layoutBox, Display::Box& displayBox) const
+void FormattingContext::computeWidth(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
{
if (layoutBox.isOutOfFlowPositioned())
- return computeOutOfFlowWidth(layoutBox, displayBox);
+ return computeOutOfFlowWidth(layoutContext, layoutBox, displayBox);
if (layoutBox.isFloatingPositioned())
return computeFloatingWidth(layoutBox, displayBox);
return computeInFlowWidth(layoutBox, displayBox);
@@ -77,8 +78,13 @@
return computeInFlowHeight(layoutContext, layoutBox, displayBox);
}
-void FormattingContext::computeOutOfFlowWidth(const Box&, Display::Box&) const
+void FormattingContext::computeOutOfFlowWidth(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
{
+ if (!layoutBox.isReplaced()) {
+ computeOutOfFlowNonReplacedWidth(layoutContext, layoutBox, displayBox);
+ return;
+ }
+ ASSERT_NOT_REACHED();
}
void FormattingContext::computeFloatingWidth(const Box&, Display::Box&) const
@@ -126,7 +132,7 @@
auto& displayBox = layoutContext.createDisplayBox(layoutBox);
computeOutOfFlowPosition(layoutBox, displayBox);
- computeOutOfFlowWidth(layoutBox, displayBox);
+ computeOutOfFlowWidth(layoutContext, layoutBox, displayBox);
ASSERT(layoutBox.establishesFormattingContext());
auto formattingContext = layoutContext.formattingContext(layoutBox);
@@ -136,6 +142,61 @@
}
}
+void FormattingContext::computeOutOfFlowNonReplacedWidth(LayoutContext& layoutContext, const Box& layoutBox, Display::Box& displayBox) const
+{
+ // 'left' + 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' + 'right'
+ // = width of containing block
+
+ // If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0.
+ // Then, if the 'direction' property of the element establishing the static-position containing block is 'ltr' set 'left' to the static
+ // position and apply rule number three below; otherwise, set 'right' to the static position and apply rule number one below.
+
+ // 1. 'left' and 'width' are 'auto' and 'right' is not 'auto', then the width is shrink-to-fit. Then solve for 'left'
+ // 2. 'left' and 'right' are 'auto' and 'width' is not 'auto', then if the 'direction' property of the element establishing the static-position
+ // containing block is 'ltr' set 'left' to the static position, otherwise set 'right' to the static position.
+ // Then solve for 'left' (if 'direction is 'rtl') or 'right' (if 'direction' is 'ltr').
+ // 3. 'width' and 'right' are 'auto' and 'left' is not 'auto', then the width is shrink-to-fit . Then solve for 'right'
+ // 4. 'left' is 'auto', 'width' and 'right' are not 'auto', then solve for 'left'
+ // 5. 'width' is 'auto', 'left' and 'right' are not 'auto', then solve for 'width'
+ // 6. 'right' is 'auto', 'left' and 'width' are not 'auto', then solve for 'right'
+ auto& style = layoutBox.style();
+ auto left = style.logicalLeft();
+ auto right = style.logicalRight();
+ auto width = style.logicalWidth();
+
+ auto containingBlockWidth = layoutContext.displayBoxForLayoutBox(*layoutBox.containingBlock())->width();
+ LayoutUnit computedWidthValue;
+
+ if ((left.isAuto() && width.isAuto() && right.isAuto())
+ || (left.isAuto() && width.isAuto() && !right.isAuto())
+ || (!left.isAuto() && width.isAuto() && right.isAuto())) {
+ // All auto (#1), #1 and #3
+ computedWidthValue = shrinkToFitWidth(layoutContext, layoutBox);
+ } else if (!left.isAuto() && width.isAuto() && !right.isAuto()) {
+ // #5
+ auto marginLeft = style.marginLeft().isAuto() ? LayoutUnit() : valueForLength(style.marginLeft(), containingBlockWidth);
+ auto marginRight = style.marginRight().isAuto() ? LayoutUnit() : valueForLength(style.marginRight(), containingBlockWidth);
+
+ auto paddingLeft = valueForLength(style.paddingTop(), containingBlockWidth);
+ auto paddingRight = valueForLength(style.paddingBottom(), containingBlockWidth);
+
+ auto borderLeftWidth = style.borderStartWidth();
+ auto borderRightWidth = style.borderEndWidth();
+
+ computedWidthValue = containingBlockWidth - (left.value() + marginLeft + borderLeftWidth + paddingLeft + paddingRight + borderRightWidth + marginRight + right.value());
+ } else if (!width.isAuto())
+ computedWidthValue = valueForLength(width, containingBlockWidth);
+ else
+ ASSERT_NOT_REACHED();
+
+ displayBox.setWidth(computedWidthValue);
}
+
+LayoutUnit FormattingContext::shrinkToFitWidth(LayoutContext&, const Box&) const
+{
+ return 0;
}
+
+}
+}
#endif
Modified: trunk/Source/WebCore/layout/FormattingContext.h (231755 => 231756)
--- trunk/Source/WebCore/layout/FormattingContext.h 2018-05-14 14:39:18 UTC (rev 231755)
+++ trunk/Source/WebCore/layout/FormattingContext.h 2018-05-14 14:52:50 UTC (rev 231756)
@@ -68,10 +68,10 @@
virtual void computeInFlowPositionedPosition(const Box&, Display::Box&) const;
virtual void computeOutOfFlowPosition(const Box&, Display::Box&) const;
- virtual void computeWidth(const Box&, Display::Box&) const;
+ virtual void computeWidth(LayoutContext&, const Box&, Display::Box&) const;
virtual void computeHeight(LayoutContext&, const Box&, Display::Box&) const;
- virtual void computeOutOfFlowWidth(const Box&, Display::Box&) const;
+ virtual void computeOutOfFlowWidth(LayoutContext&, const Box&, Display::Box&) const;
virtual void computeFloatingWidth(const Box&, Display::Box&) const;
virtual void computeInFlowWidth(const Box&, Display::Box&) const = 0;
@@ -88,6 +88,9 @@
void layoutOutOfFlowDescendants(LayoutContext&s) const;
private:
+ void computeOutOfFlowNonReplacedWidth(LayoutContext&, const Box&, Display::Box&) const;
+ LayoutUnit shrinkToFitWidth(LayoutContext&, const Box&) const;
+
WeakPtr<Box> m_root;
};
Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (231755 => 231756)
--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp 2018-05-14 14:39:18 UTC (rev 231755)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp 2018-05-14 14:52:50 UTC (rev 231756)
@@ -74,7 +74,7 @@
auto& layoutBox = layoutPair.layoutBox;
auto& displayBox = layoutPair.displayBox;
- computeWidth(layoutBox, displayBox);
+ computeWidth(layoutContext, layoutBox, displayBox);
computeStaticPosition(layoutContext, layoutBox, layoutPair.displayBox);
if (layoutBox.establishesFormattingContext()) {
auto formattingContext = layoutContext.formattingContext(layoutBox);
Modified: trunk/Source/WebCore/layout/displaytree/DisplayBox.h (231755 => 231756)
--- trunk/Source/WebCore/layout/displaytree/DisplayBox.h 2018-05-14 14:39:18 UTC (rev 231755)
+++ trunk/Source/WebCore/layout/displaytree/DisplayBox.h 2018-05-14 14:52:50 UTC (rev 231756)
@@ -35,8 +35,9 @@
namespace WebCore {
namespace Layout {
+class BlockFormattingContext;
+class FormattingContext;
class LayoutContext;
-class BlockFormattingContext;
}
namespace Display {
@@ -45,6 +46,7 @@
WTF_MAKE_ISO_ALLOCATED(Box);
public:
friend class Layout::LayoutContext;
+ friend class Layout::FormattingContext;
friend class Layout::BlockFormattingContext;
~Box();
