Diff
Modified: trunk/LayoutTests/ChangeLog (239925 => 239926)
--- trunk/LayoutTests/ChangeLog 2019-01-14 15:22:43 UTC (rev 239925)
+++ trunk/LayoutTests/ChangeLog 2019-01-14 15:42:21 UTC (rev 239926)
@@ -1,3 +1,13 @@
+2019-01-14 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC] Add basic box-sizing support.
+ https://bugs.webkit.org/show_bug.cgi?id=193392
+
+ Reviewed by Antti Koivisto.
+
+ * fast/block/block-only/box-sizing-inflow-out-of-flow-simple-expected.txt: Added.
+ * fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html: Added.
+
2019-01-14 Zan Dobersek <zdober...@igalia.com>
Unreviewed WPE gardening. Updating baselines for failures that in
Added: trunk/LayoutTests/fast/block/block-only/box-sizing-inflow-out-of-flow-simple-expected.txt (0 => 239926)
--- trunk/LayoutTests/fast/block/block-only/box-sizing-inflow-out-of-flow-simple-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/block/block-only/box-sizing-inflow-out-of-flow-simple-expected.txt 2019-01-14 15:42:21 UTC (rev 239926)
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,10) size 784x580
+ RenderBlock {DIV} at (10,0) size 20x20 [border: (2px solid #000000)]
+ RenderBlock {DIV} at (10,30) size 20x20 [border: (2px solid #000000)]
+layer at (18,80) size 20x20
+ RenderBlock (positioned) {DIV} at (18,80) size 20x20 [border: (2px solid #000000)]
+layer at (48,80) size 20x20
+ RenderBlock (positioned) {DIV} at (48,80) size 20x20 [border: (2px solid #000000)]
Added: trunk/LayoutTests/fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html (0 => 239926)
--- trunk/LayoutTests/fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html (rev 0)
+++ trunk/LayoutTests/fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html 2019-01-14 15:42:21 UTC (rev 239926)
@@ -0,0 +1,12 @@
+<style>
+div {
+ border: 2px solid black;
+ padding: 4px;
+ -webkit-box-sizing: border-box;
+ margin: 10px;
+}
+</style>
+<div style="-webkit-box-sizing: content-box; width:8px; height:8px"></div>
+<div style="width:20px; height:20px"></div>
+<div style="position:absolute; -webkit-box-sizing: content-box; width:8px; height:8px"></div>
+<div style="position:absolute; left:38px; width:20px; height:20px"></div>
Modified: trunk/Source/WebCore/ChangeLog (239925 => 239926)
--- trunk/Source/WebCore/ChangeLog 2019-01-14 15:22:43 UTC (rev 239925)
+++ trunk/Source/WebCore/ChangeLog 2019-01-14 15:42:21 UTC (rev 239926)
@@ -1,3 +1,23 @@
+2019-01-14 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC] Add basic box-sizing support.
+ https://bugs.webkit.org/show_bug.cgi?id=193392
+
+ Reviewed by Antti Koivisto.
+
+ No min/max support yet.
+
+ Test: fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html
+
+ * layout/FormattingContextGeometry.cpp:
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
+ (WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry):
+ * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+ (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
+ (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedWidthAndMargin):
+ * page/FrameViewLayoutContext.cpp:
+ (WebCore::layoutUsingFormattingContext):
+
2019-01-14 Thibault Saunier <tsaun...@igalia.com>
[GStreamer][WebRTC] Override DeviceType() in RealtimeMediaSource implementations
Modified: trunk/Source/WebCore/layout/FormattingContextGeometry.cpp (239925 => 239926)
--- trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2019-01-14 15:22:43 UTC (rev 239925)
+++ trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2019-01-14 15:42:21 UTC (rev 239926)
@@ -285,6 +285,10 @@
auto paddingBottom = displayBox.paddingBottom().valueOr(0);
auto borderTop = displayBox.borderTop();
auto borderBottom = displayBox.borderBottom();
+ auto contentHeight = [&] {
+ ASSERT(height);
+ return style.boxSizing() == BoxSizing::ContentBox ? *height : *height - (borderTop + paddingTop + paddingBottom + borderBottom);
+ };
if (!top && !height && !bottom)
top = staticVerticalPositionForOutOfFlowPositioned(layoutState, layoutBox);
@@ -291,19 +295,19 @@
if (top && height && bottom) {
if (!computedVerticalMargin.before && !computedVerticalMargin.after) {
- auto marginBeforeAndAfter = containingBlockHeight - (*top + borderTop + paddingTop + *height + paddingBottom + borderBottom + *bottom);
+ auto marginBeforeAndAfter = containingBlockHeight - (*top + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + *bottom);
usedVerticalMargin = { marginBeforeAndAfter / 2, marginBeforeAndAfter / 2 };
} else if (!computedVerticalMargin.before) {
usedVerticalMargin.after = *computedVerticalMargin.after;
- usedVerticalMargin.before = containingBlockHeight - (*top + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
+ usedVerticalMargin.before = containingBlockHeight - (*top + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
} else {
usedVerticalMargin.before = *computedVerticalMargin.before;
- usedVerticalMargin.after = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + *bottom);
+ usedVerticalMargin.after = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + *bottom);
}
// Over-constrained?
- auto boxHeight = *top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom;
+ auto boxHeight = *top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom;
if (boxHeight > containingBlockHeight)
- bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after);
+ bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after);
}
if (!top && !height && bottom) {
@@ -317,7 +321,7 @@
// #2
top = staticVerticalPositionForOutOfFlowPositioned(layoutState, layoutBox);
usedVerticalMargin = { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
- bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after);
+ bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after);
}
if (!height && !bottom && top) {
@@ -324,25 +328,25 @@
// #3
height = contentHeightForFormattingContextRoot(layoutState, layoutBox);
usedVerticalMargin = { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
- bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after);
+ bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after);
}
if (!top && height && bottom) {
// #4
usedVerticalMargin = { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
- top = containingBlockHeight - (usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
+ top = containingBlockHeight - (usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
}
if (!height && top && bottom) {
// #5
usedVerticalMargin = { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
- height = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
+ height = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + paddingBottom + borderBottom + usedVerticalMargin.after + *bottom);
}
if (!bottom && top && height) {
// #6
usedVerticalMargin = { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
- bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + *height + paddingBottom + borderBottom + usedVerticalMargin.after);
+ bottom = containingBlockHeight - (*top + usedVerticalMargin.before + borderTop + paddingTop + contentHeight() + paddingBottom + borderBottom + usedVerticalMargin.after);
}
ASSERT(top);
@@ -350,7 +354,7 @@
ASSERT(height);
LOG_WITH_STREAM(FormattingContextLayout, stream << "[Position][Height][Margin] -> out-of-flow non-replaced -> top(" << *top << "px) bottom(" << *bottom << "px) height(" << *height << "px) margin(" << usedVerticalMargin.before << "px, " << usedVerticalMargin.after << "px) layoutBox(" << &layoutBox << ")");
- return { *top, *bottom, { *height, usedVerticalMargin } };
+ return { *top, *bottom, { contentHeight(), usedVerticalMargin } };
}
HorizontalGeometry FormattingContext::Geometry::outOfFlowNonReplacedHorizontalGeometry(LayoutState& layoutState, const Box& layoutBox, Optional<LayoutUnit> usedWidth)
@@ -398,6 +402,10 @@
auto paddingRight = displayBox.paddingRight().valueOr(0);
auto borderLeft = displayBox.borderLeft();
auto borderRight = displayBox.borderRight();
+ auto contentWidth = [&] {
+ ASSERT(width);
+ return style.boxSizing() == BoxSizing::ContentBox ? *width : *width - (borderLeft + paddingLeft + paddingRight + borderRight);
+ };
if (!left && !width && !right) {
// If all three of 'left', 'width', and 'right' are 'auto': First set any 'auto' values for 'margin-left' and 'margin-right' to 0.
@@ -417,37 +425,37 @@
// If the values are over-constrained, ignore the value for 'left' (in case the 'direction' property of the containing block is 'rtl') or 'right'
// (in case 'direction' is 'ltr') and solve for that value.
if (!computedHorizontalMargin.start && !computedHorizontalMargin.end) {
- auto marginStartAndEnd = containingBlockWidth - (*left + borderLeft + paddingLeft + *width + paddingRight + borderRight + *right);
+ auto marginStartAndEnd = containingBlockWidth - (*left + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + *right);
if (marginStartAndEnd >= 0)
usedHorizontalMargin = { marginStartAndEnd / 2, marginStartAndEnd / 2 };
else {
if (isLeftToRightDirection) {
usedHorizontalMargin.start = 0_lu;
- usedHorizontalMargin.end = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + *right);
+ usedHorizontalMargin.end = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + *right);
} else {
usedHorizontalMargin.end = 0_lu;
- usedHorizontalMargin.start = containingBlockWidth - (*left + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end + *right);
+ usedHorizontalMargin.start = containingBlockWidth - (*left + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end + *right);
}
}
} else if (!computedHorizontalMargin.start) {
usedHorizontalMargin.end = *computedHorizontalMargin.end;
- usedHorizontalMargin.start = containingBlockWidth - (*left + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end + *right);
+ usedHorizontalMargin.start = containingBlockWidth - (*left + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end + *right);
// Overconstrained? Ignore right (left).
if (usedHorizontalMargin.start < 0) {
if (isLeftToRightDirection)
- usedHorizontalMargin.start = containingBlockWidth - (*left + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end);
+ usedHorizontalMargin.start = containingBlockWidth - (*left + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end);
else
- usedHorizontalMargin.start = containingBlockWidth - (borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end + *right);
+ usedHorizontalMargin.start = containingBlockWidth - (borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end + *right);
}
} else if (!computedHorizontalMargin.end) {
usedHorizontalMargin.start = *computedHorizontalMargin.start;
- usedHorizontalMargin.end = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + *right);
+ usedHorizontalMargin.end = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + *right);
// Overconstrained? Ignore right (left).
if (usedHorizontalMargin.end < 0) {
if (isLeftToRightDirection)
- usedHorizontalMargin.end = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight);
+ usedHorizontalMargin.end = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight);
else
- usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + *right);
+ usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + *right);
}
}
} else {
@@ -464,10 +472,10 @@
auto staticHorizontalPosition = staticHorizontalPositionForOutOfFlowPositioned(layoutState, layoutBox);
if (isLeftToRightDirection) {
left = staticHorizontalPosition;
- right = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end);
+ right = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end);
} else {
right = staticHorizontalPosition;
- left = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end + *right);
+ left = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end + *right);
}
} else if (!width && !right && left) {
// #3
@@ -475,13 +483,13 @@
right = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end);
} else if (!left && width && right) {
// #4
- left = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end + *right);
+ left = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end + *right);
} else if (!width && left && right) {
// #5
- width = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + paddingRight + borderRight + usedHorizontalMargin.end + *right);
+ width = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + paddingRight + borderRight + usedHorizontalMargin.end + *right);
} else if (!right && left && width) {
// #6
- right = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end);
+ right = containingBlockWidth - (*left + usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end);
}
ASSERT(left);
@@ -489,7 +497,7 @@
ASSERT(width);
LOG_WITH_STREAM(FormattingContextLayout, stream << "[Position][Width][Margin] -> out-of-flow non-replaced -> left(" << *left << "px) right(" << *right << "px) width(" << *width << "px) margin(" << usedHorizontalMargin.start << "px, " << usedHorizontalMargin.end << "px) layoutBox(" << &layoutBox << ")");
- return { *left, *right, { *width, usedHorizontalMargin, computedHorizontalMargin } };
+ return { *left, *right, { contentWidth(), usedHorizontalMargin, computedHorizontalMargin } };
}
VerticalGeometry FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry(const LayoutState& layoutState, const Box& layoutBox, Optional<LayoutUnit> usedHeight)
Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp (239925 => 239926)
--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp 2019-01-14 15:22:43 UTC (rev 239925)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp 2019-01-14 15:42:21 UTC (rev 239926)
@@ -61,11 +61,14 @@
auto computedVerticalMargin = Geometry::computedVerticalMargin(layoutState, layoutBox);
auto nonCollapsedMargin = UsedVerticalMargin::NonCollapsedValues { computedVerticalMargin.before.valueOr(0), computedVerticalMargin.after.valueOr(0) };
auto borderAndPaddingTop = displayBox.borderTop() + displayBox.paddingTop().valueOr(0);
-
auto height = usedHeight ? usedHeight.value() : computedHeightValue(layoutState, layoutBox, HeightType::Normal);
- if (height)
- return { height.value(), nonCollapsedMargin };
+ if (height) {
+ auto borderAndPaddingBottom = displayBox.borderBottom() + displayBox.paddingBottom().valueOr(0);
+ auto contentHeight = layoutBox.style().boxSizing() == BoxSizing::ContentBox ? *height : *height - (borderAndPaddingTop + borderAndPaddingBottom);
+ return { contentHeight, nonCollapsedMargin };
+ }
+
if (!is<Container>(layoutBox) || !downcast<Container>(layoutBox).hasInFlowChild())
return { 0, nonCollapsedMargin };
@@ -142,10 +145,14 @@
auto borderRight = displayBox.borderRight();
auto paddingLeft = displayBox.paddingLeft().valueOr(0);
auto paddingRight = displayBox.paddingRight().valueOr(0);
+ auto contentWidth = [&] {
+ ASSERT(width);
+ return style.boxSizing() == BoxSizing::ContentBox ? *width : *width - (borderLeft + paddingLeft + paddingRight + borderRight);
+ };
// #1
if (width) {
- auto horizontalSpaceForMargin = containingBlockWidth - (computedHorizontalMargin.start.valueOr(0) + borderLeft + paddingLeft + *width + paddingRight + borderRight + computedHorizontalMargin.end.valueOr(0));
+ auto horizontalSpaceForMargin = containingBlockWidth - (computedHorizontalMargin.start.valueOr(0) + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + computedHorizontalMargin.end.valueOr(0));
if (horizontalSpaceForMargin < 0)
usedHorizontalMargin = { computedHorizontalMargin.start.valueOr(0), computedHorizontalMargin.end.valueOr(0) };
}
@@ -154,10 +161,10 @@
if (width && computedHorizontalMargin.start && computedHorizontalMargin.end) {
if (containingBlock->style().isLeftToRightDirection()) {
usedHorizontalMargin.start = *computedHorizontalMargin.start;
- usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight);
+ usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight);
} else {
usedHorizontalMargin.end = *computedHorizontalMargin.end;
- usedHorizontalMargin.start = containingBlockWidth - (borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end);
+ usedHorizontalMargin.start = containingBlockWidth - (borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end);
}
}
@@ -164,13 +171,13 @@
// #3
if (!computedHorizontalMargin.start && width && computedHorizontalMargin.end) {
usedHorizontalMargin.end = *computedHorizontalMargin.end;
- usedHorizontalMargin.start = containingBlockWidth - (borderLeft + paddingLeft + *width + paddingRight + borderRight + usedHorizontalMargin.end);
+ usedHorizontalMargin.start = containingBlockWidth - (borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight + usedHorizontalMargin.end);
} else if (computedHorizontalMargin.start && !width && computedHorizontalMargin.end) {
usedHorizontalMargin = { *computedHorizontalMargin.start, *computedHorizontalMargin.end };
width = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + paddingRight + borderRight + usedHorizontalMargin.end);
} else if (computedHorizontalMargin.start && width && !computedHorizontalMargin.end) {
usedHorizontalMargin.start = *computedHorizontalMargin.start;
- usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + *width + paddingRight + borderRight);
+ usedHorizontalMargin.end = containingBlockWidth - (usedHorizontalMargin.start + borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight);
}
// #4
@@ -181,13 +188,13 @@
// #5
if (!computedHorizontalMargin.start && !computedHorizontalMargin.end) {
- auto horizontalSpaceForMargin = containingBlockWidth - (borderLeft + paddingLeft + *width + paddingRight + borderRight);
+ auto horizontalSpaceForMargin = containingBlockWidth - (borderLeft + paddingLeft + contentWidth() + paddingRight + borderRight);
usedHorizontalMargin = { horizontalSpaceForMargin / 2, horizontalSpaceForMargin / 2 };
}
ASSERT(width);
- return WidthAndMargin { *width, usedHorizontalMargin, computedHorizontalMargin };
+ return WidthAndMargin { contentWidth(), usedHorizontalMargin, computedHorizontalMargin };
};
auto widthAndMargin = compute();
Modified: trunk/Tools/ChangeLog (239925 => 239926)
--- trunk/Tools/ChangeLog 2019-01-14 15:22:43 UTC (rev 239925)
+++ trunk/Tools/ChangeLog 2019-01-14 15:42:21 UTC (rev 239926)
@@ -1,3 +1,12 @@
+2019-01-14 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC] Add basic box-sizing support.
+ https://bugs.webkit.org/show_bug.cgi?id=193392
+
+ Reviewed by Antti Koivisto.
+
+ * LayoutReloaded/misc/LFC-passing-tests.txt:
+
2019-01-14 Charlie Turner <ctur...@igalia.com>
[WPE] API test gardening
Modified: trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt (239925 => 239926)
--- trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt 2019-01-14 15:22:43 UTC (rev 239925)
+++ trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt 2019-01-14 15:42:21 UTC (rev 239926)
@@ -76,6 +76,7 @@
fast/block/block-only/relative-right.html
fast/block/block-only/relative-siblings.html
fast/block/block-only/relative-simple.html
+fast/block/block-only/box-sizing-inflow-out-of-flow-simple.html
fast/block/basic/002.html
fast/block/basic/003.html
fast/block/basic/006.html
