Changeset 267572 in webkit

Timestamp:

Sep 25, 2020, 9:05:45 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][Out-of-flow] ASSERTION FAILED: !layoutBox.isOutOfFlowPositioned() in WebCore::Layout::FormattingContext::Geometry::computedHeightValue
​https://bugs.webkit.org/show_bug.cgi?id=216976

Reviewed by Antti Koivisto.

Source/WebCore:

Geometry::computedHeightValue is a simple resolver function. It should not really care about
whether the box's containing block has valid vertical geometry. The callsite (where this assert is important) is already testing this condition.

Test: fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple.html

• layout/FormattingContext.h:
• layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::computedHeightValue const):
(WebCore::Layout::FormattingContext::Geometry::constraintsForInFlowContent):

• layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::layoutInFlowContent):

LayoutTests:

• fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple-expected.html: Added.
• fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/FormattingContext.h (modified) (1 diff)
• Source/WebCore/layout/FormattingContextGeometry.cpp (modified) (2 diffs)
• Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Out-of-flow] ASSERTION FAILED: !layoutBox.isOutOfFlowPositioned() in WebCore::Layout::FormattingContext::Geometry::computedHeightValue
+        https://bugs.webkit.org/show_bug.cgi?id=216976
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple-expected.html: Added.
+        * fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple.html: Added.
+
 2020-09-25  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Out-of-flow] ASSERTION FAILED: !layoutBox.isOutOfFlowPositioned() in WebCore::Layout::FormattingContext::Geometry::computedHeightValue
+        https://bugs.webkit.org/show_bug.cgi?id=216976
+
+        Reviewed by Antti Koivisto.
+
+        Geometry::computedHeightValue is a simple resolver function. It should not really care about
+        whether the box's containing block has valid vertical geometry. The callsite (where this assert is important) is already testing this condition.
+
+        Test: fast/layoutformattingcontext/out-of-flow-with-non-fixed-height-simple.html
+
+        * layout/FormattingContext.h:
+        * layout/FormattingContextGeometry.cpp:
+        (WebCore::Layout::FormattingContext::Geometry::computedHeightValue const):
+        (WebCore::Layout::FormattingContext::Geometry::constraintsForInFlowContent):
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::layoutInFlowContent):
+
 2020-09-25  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/layout/FormattingContext.h

@@ -41 +41 @@
 namespace Layout {
 
-class Box;
 class BoxGeometry;
 class ReplacedBox;

trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

@@ -75 +75 @@
 
     if (!containingBlockHeight) {
-        // Containing block's height is already computed since we layout the out-of-flow boxes as the last step.
-        ASSERT(!layoutBox.isOutOfFlowPositioned());
         if (layoutState().inQuirksMode())
             containingBlockHeight = formattingContext().quirks().heightValueOfNearestContainingBlockWithFixedHeight(layoutBox);
@@ -1175 +1173 @@
 {
     auto& boxGeometry = formattingContext().geometryForBox(containerBox, escapeReason);
-    // FIXME: Find out if min/max-height properties should also be taken into account here.
     return { { boxGeometry.contentBoxLeft(), boxGeometry.contentBoxWidth() }, { boxGeometry.contentBoxTop(), computedHeight(containerBox) } };
 }

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp

@@ -148 +148 @@
             auto establishesFormattingContext = layoutBox.establishesFormattingContext(); 
             if (establishesFormattingContext) {
-                // Now that we computed the root's height, we can layout the out-of-flow descendants.
+                // Now that we computed the box's height, we can layout the out-of-flow descendants.
                 if (is<ContainerBox>(layoutBox) && downcast<ContainerBox>(layoutBox).hasChild()) {
                     auto& containerBox = downcast<ContainerBox>(layoutBox);