[blocks-in-inline] Add support for block after side of margin handling (part 2)

https://bugs.webkit.org/show_bug.cgi?id=303006

Reviewed by Antti Koivisto.

RenderBlockFlows with block level boxes only, handle their after side of margin collapsing
by calling handleAfterSideOfBlock. This function looks into the MarginInfo state which,
at this point, holds information about the trailing child's margin state.

Now with blocks-in-inline, we could end up with such trailing block level elements and
this patch ensures that their margins are taken into account.

Test: fast/inline/blocks-in-inline-layout-with-margin-after2.html

* LayoutTests/fast/inline/blocks-in-inline-layout-with-margin-after2-expected.html: Added.
* LayoutTests/fast/inline/blocks-in-inline-layout-with-margin-after2.html: Added.
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:
(WebCore::Layout::InlineDisplayLineBuilder::adjustLineBlockAfterSideWithCollapsedMargin):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::layout):
(WebCore::LayoutIntegration::initialMarginState): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutInlineContent):

Canonical link: https://commits.webkit.org/303510@main

Author: alanbaradlay

LayoutTests/fast/inline/blocks-in-inline-layout-with-margin-after2-expected.html

@@ -0,0 +1,21 @@
+<style>
+.margin-collapse-boundary {
+  border: 1px solid green;
+}
+
+.container {
+  background-color: green;
+}
+
+.middle-block {
+  margin-bottom: 100px;
+}
+</style>
+<div class=margin-collapse-boundary>
+  <div class=container>
+    <span>
+      span start
+      <div class=middle-block>block content with margin bottom</div>
+    </span>
+  </div>
+</div>

LayoutTests/fast/inline/blocks-in-inline-layout-with-margin-after2.html

@@ -0,0 +1,22 @@
+<!-- webkit-test-runner [ BlocksInInlineLayoutEnabled=true ] -->
+<style>
+.margin-collapse-boundary {
+  border: 1px solid green;
+}
+
+.container {
+  background-color: green;
+}
+
+.middle-block {
+  margin-bottom: 100px;
+}
+</style>
+<div class=margin-collapse-boundary>
+  <div class=container>
+    <span>
+      span start
+      <div class=middle-block>block content with margin bottom</div>
+    </span>
+  </div>
+</div>

Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp

@@ -521,7 +521,7 @@ void InlineDisplayLineBuilder::adjustLineBlockAfterSideWithCollapsedMargin(const
         return;
     }
 
-    if (!marginState.canCollapseMarginAfterWithChildren || !marginState.margin())
+    if (!marginState.margin())
         return;
 
     auto& lastLineWithBlockContent = displayLines[lineIndexWithBlockLevelBox];

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp

@@ -44,6 +44,7 @@
 #include "LayoutIntegrationInlineContentBuilder.h"
 #include "LayoutIntegrationInlineContentPainter.h"
 #include "LayoutIntegrationPagination.h"
+#include "LayoutIntegrationUtils.h"
 #include "LayoutTreeBuilder.h"
 #include "PaintInfo.h"
 #include "PlacedFloats.h"
@@ -483,13 +484,7 @@ static inline std::optional<Layout::BlockLayoutState::LineGrid> lineGrid(const R
     return { };
 }
 
-static inline Layout::BlockLayoutState::MarginState initialMarginState(const RenderBlockFlow& rootRenderer)
-{
-    auto marginInfo = RenderBlockFlow::MarginInfo { rootRenderer, RenderBlockFlow::MarginInfo::IgnoreScrollbarForAfterMargin::No };
-    return { marginInfo.canCollapseWithChildren(), marginInfo.canCollapseMarginBeforeWithChildren(), marginInfo.canCollapseMarginAfterWithChildren(), marginInfo.quirkContainer(), marginInfo.atBeforeSideOfBlock(), marginInfo.atAfterSideOfBlock(), marginInfo.hasMarginBeforeQuirk(), marginInfo.hasMarginAfterQuirk(), marginInfo.determinedMarginBeforeQuirk(), marginInfo.positiveMargin(), marginInfo.negativeMargin() };
-}
-
-std::optional<LayoutRect> LineLayout::layout(ForceFullLayout forcedFullLayout)
+std::optional<LayoutRect> LineLayout::layout(RenderBlockFlow::MarginInfo& marginInfo, ForceFullLayout forcedFullLayout)
 {
     if (forcedFullLayout == ForceFullLayout::Yes && m_lineDamage)
         Layout::InlineInvalidation::resetInlineDamage(*m_lineDamage);
@@ -524,7 +519,7 @@ std::optional<LayoutRect> LineLayout::layout(ForceFullLayout forcedFullLayout)
 
     auto parentBlockLayoutState = Layout::BlockLayoutState {
         m_blockFormattingState.placedFloats(),
-        initialMarginState(flow()),
+        Layout::IntegrationUtils::toMarginState(marginInfo),
         lineClamp(flow()),
         textBoxTrim(flow()),
         flow().style().textBoxEdge(),
@@ -546,11 +541,12 @@ std::optional<LayoutRect> LineLayout::layout(ForceFullLayout forcedFullLayout)
 
     if (m_lineDamage) {
         // Pagination may require another layout pass.
-        layout();
+        layout(marginInfo);
 
         ASSERT(!m_lineDamage);
     }
 
+    marginInfo = Layout::IntegrationUtils::toMarginInfo(parentBlockLayoutState.marginState());
     return isPartialLayout ? std::make_optional(repaintRect) : std::nullopt;
 }
 

Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h

@@ -93,7 +93,7 @@ class LineLayout final : public CanMakeCheckedPtr<LineLayout> {
     std::pair<LayoutUnit, LayoutUnit> computeIntrinsicWidthConstraints();
 
     enum class ForceFullLayout : bool { No, Yes };
-    std::optional<LayoutRect> layout(ForceFullLayout = ForceFullLayout::No);
+    std::optional<LayoutRect> layout(RenderBlockFlow::MarginInfo&, ForceFullLayout = ForceFullLayout::No);
     void paint(PaintInfo&, const LayoutPoint& paintOffset, const RenderInline* layerRenderer = nullptr);
     bool hitTest(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint& accumulatedOffset, HitTestAction, const RenderInline* layerRenderer = nullptr);
     void adjustForPagination();

Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -4106,14 +4106,14 @@ void RenderBlockFlow::layoutInlineContent(RelayoutChildren relayoutChildren, Lay
 
     ASSERT(containingBlock() || is<RenderView>(*this));
     inlineLayout.updateFormattingContexGeometries(containingBlock() ? containingBlockLogicalWidthForContent() : LayoutUnit());
-    auto partialRepaintRect = inlineLayout.layout(relayoutChildren == RelayoutChildren::Yes ? LayoutIntegration::LineLayout::ForceFullLayout::Yes : LayoutIntegration::LineLayout::ForceFullLayout::No);
+
+    auto marginInfo = MarginInfo { *this, MarginInfo::IgnoreScrollbarForAfterMargin::No };
+    auto partialRepaintRect = inlineLayout.layout(marginInfo, relayoutChildren == RelayoutChildren::Yes ? LayoutIntegration::LineLayout::ForceFullLayout::Yes : LayoutIntegration::LineLayout::ForceFullLayout::No);
 
     auto clampedContentHeight = updateLineClampStateAndLogicalHeightAfterLayout();
-    auto borderBoxLogicalHeight = [&] {
-        auto contentHeight = clampedContentHeight.value_or(!hasLines() && hasLineIfEmpty() ? lineHeight() : inlineLayout.contentLogicalHeight());
-        return borderAndPaddingLogicalHeight() + contentHeight + scrollbarLogicalHeight();
-    };
-    setLogicalHeight(borderBoxLogicalHeight());
+    auto contentBoxHeight = clampedContentHeight.value_or(!hasLines() && hasLineIfEmpty() ? lineHeight() : inlineLayout.contentLogicalHeight());
+    auto borderBoxLogicalHeight = handleAfterSideOfBlock(marginInfo, contentBoxHeight);
+    setLogicalHeight(borderBoxLogicalHeight);
     updateRepaintTopAndBottomAfterLayout(relayoutChildren, partialRepaintRect, oldContentTopAndBottomIncludingInkOverflow, repaintLogicalTop, repaintLogicalBottom);
 }