Modified: trunk/Source/WebCore/ChangeLog (234254 => 234255)
--- trunk/Source/WebCore/ChangeLog 2018-07-26 14:07:23 UTC (rev 234254)
+++ trunk/Source/WebCore/ChangeLog 2018-07-26 14:25:51 UTC (rev 234255)
@@ -1,3 +1,17 @@
+2018-07-26 Zalan Bujtas <[email protected]>
+
+ [LFC][BFC] Do not try to access containing block's height during descendant height computation
+ https://bugs.webkit.org/show_bug.cgi?id=187970
+
+ Reviewed by Antti Koivisto.
+
+ Mostly becasue in BFC, we compute the descendents' height first so the containing block's height is probably not computed yet.
+
+ * layout/FormattingContextGeometry.cpp:
+ (WebCore::Layout::FormattingContext::Geometry::floatingNonReplacedHeightAndMargin):
+ (WebCore::Layout::FormattingContext::Geometry::inlineReplacedHeightAndMargin):
+ (WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin):
+
2018-07-26 Frederic Wang <[email protected]>
Unreviewed, add bug references into FIXME comments for CSSOM View API
Modified: trunk/Source/WebCore/layout/FormattingContextGeometry.cpp (234254 => 234255)
--- trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2018-07-26 14:07:23 UTC (rev 234254)
+++ trunk/Source/WebCore/layout/FormattingContextGeometry.cpp 2018-07-26 14:25:51 UTC (rev 234255)
@@ -586,10 +586,9 @@
auto& style = layoutBox.style();
auto& containingBlock = *layoutBox.containingBlock();
auto& containingBlockDisplayBox = *layoutContext.displayBoxForLayoutBox(containingBlock);
- auto containingBlockHeight = containingBlockDisplayBox.contentBoxHeight();
auto containingBlockWidth = containingBlockDisplayBox.contentBoxWidth();
- auto height = computedValueIfNotAuto(style.logicalHeight(), containingBlockHeight);
+ auto height = fixedValue(style.logicalHeight());
auto marginTop = computedValueIfNotAuto(style.marginTop(), containingBlockWidth);
auto marginBottom = computedValueIfNotAuto(style.marginBottom(), containingBlockWidth);
@@ -597,9 +596,17 @@
marginTop = marginTop.value_or(0);
marginBottom = marginBottom.value_or(0);
// #2
- if (!height)
- height = contentHeightForFormattingContextRoot(layoutContext, layoutBox);
+ if (!height) {
+ if (style.logicalHeight().isAuto())
+ height = contentHeightForFormattingContextRoot(layoutContext, layoutBox);
+ else
+ ASSERT_NOT_IMPLEMENTED_YET();
+ }
+ ASSERT(height);
+ ASSERT(marginTop);
+ ASSERT(marginBottom);
+
LOG_WITH_STREAM(FormattingContextLayout, stream << "[Height][Margin] -> floating non-replaced -> height(" << *height << "px) margin(" << *marginTop << "px, " << *marginBottom << "px) -> layoutBox(" << &layoutBox << ")");
return HeightAndMargin { *height, { *marginTop, *marginBottom }, { } };
}
@@ -707,22 +714,25 @@
auto& style = layoutBox.style();
auto replaced = layoutBox.replaced();
auto& containingBlockDisplayBox = *layoutContext.displayBoxForLayoutBox(*layoutBox.containingBlock());
- auto containingBlockHeight = containingBlockDisplayBox.height();
auto containingBlockWidth = containingBlockDisplayBox.width();
- auto height = computedValueIfNotAuto(style.logicalHeight(), containingBlockHeight);
+ auto height = fixedValue(style.logicalHeight());
+ auto heightIsAuto = style.logicalHeight().isAuto();
auto width = computedValueIfNotAuto(style.logicalWidth(), containingBlockWidth);
- if (!height && !width && replaced->hasIntrinsicHeight()) {
+ if (!height && !heightIsAuto)
+ ASSERT_NOT_IMPLEMENTED_YET();
+
+ if (heightIsAuto && !width && replaced->hasIntrinsicHeight()) {
// #2
height = replaced->intrinsicHeight();
- } else if (!height && replaced->hasIntrinsicRatio()) {
+ } else if (heightIsAuto && replaced->hasIntrinsicRatio()) {
// #3
height = *width / replaced->intrinsicRatio();
- } else if (!height && replaced->hasIntrinsicHeight()) {
+ } else if (heightIsAuto && replaced->hasIntrinsicHeight()) {
// #4
height = replaced->intrinsicHeight();
- } else if (!height) {
+ } else if (heightIsAuto) {
// #5
height = { 150 };
}
@@ -759,7 +769,6 @@
auto& style = layoutBox.style();
auto& containingBlockDisplayBox = *layoutContext.displayBoxForLayoutBox(*layoutBox.containingBlock());
- auto containingBlockHeight = containingBlockDisplayBox.height();
auto containingBlockWidth = containingBlockDisplayBox.width();
auto computeMarginRight = [&]() {
@@ -776,24 +785,26 @@
return marginLeft.value_or(LayoutUnit { 0 });
};
- LayoutUnit marginLeft = computeMarginLeft();
- LayoutUnit marginRight = computeMarginRight();
+ auto replaced = layoutBox.replaced();
+ ASSERT(replaced);
- auto replaced = layoutBox.replaced();
- auto height = computedValueIfNotAuto(style.logicalHeight(), containingBlockHeight);
+ auto marginLeft = computeMarginLeft();
+ auto marginRight = computeMarginRight();
auto width = computedValueIfNotAuto(style.logicalWidth(), containingBlockWidth);
- ASSERT(replaced);
+ auto heightIsAuto = style.logicalHeight().isAuto();
+ auto height = fixedValue(style.logicalHeight());
+ if (!height && !heightIsAuto)
+ ASSERT_NOT_IMPLEMENTED_YET();
- if (!width && !height && replaced->hasIntrinsicWidth()) {
+ if (!width && heightIsAuto && replaced->hasIntrinsicWidth()) {
// #1
width = replaced->intrinsicWidth();
- } else if ((!width && !height && !replaced->hasIntrinsicWidth() && replaced->hasIntrinsicHeight() && replaced->hasIntrinsicRatio())
- || (!width && height && replaced->hasIntrinsicRatio())) {
+ } else if ((!width && heightIsAuto && !replaced->hasIntrinsicWidth() && replaced->hasIntrinsicHeight() && replaced->hasIntrinsicRatio())
+ || (!width && height && replaced->hasIntrinsicRatio())) {
// #2
- auto usedHeight = height.value_or(replaced->intrinsicHeight());
- width = usedHeight * replaced->intrinsicRatio();
- } else if (!width && !height && replaced->hasIntrinsicRatio() && !replaced->hasIntrinsicWidth() && !replaced->hasIntrinsicHeight()) {
+ width = height.value_or(replaced->hasIntrinsicHeight()) * replaced->intrinsicRatio();
+ } else if (!width && heightIsAuto && replaced->hasIntrinsicRatio() && !replaced->hasIntrinsicWidth() && !replaced->hasIntrinsicHeight()) {
// #3
// FIXME: undefined but surely doable.
ASSERT_NOT_IMPLEMENTED_YET();
@@ -805,6 +816,8 @@
width = { 300 };
}
+ ASSERT(width);
+
LOG_WITH_STREAM(FormattingContextLayout, stream << "[Width][Margin] -> inflow replaced -> width(" << *width << "px) margin(" << marginLeft << "px, " << marginRight << "px) -> layoutBox(" << &layoutBox << ")");
return { *width, { marginLeft, marginRight } };
}
