Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: cf3e7a33afc34b261402ffae8277f0a669573cb8
https://github.com/WebKit/WebKit/commit/cf3e7a33afc34b261402ffae8277f0a669573cb8
Author: Alan Baradlay <[email protected]>
Date: 2025-11-24 (Mon, 24 Nov 2025)
Changed paths:
A
LayoutTests/fast/inline/blocks-in-inline-layout-with-margin-after2-expected.html
A LayoutTests/fast/inline/blocks-in-inline-layout-with-margin-after2.html
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h
M Source/WebCore/rendering/RenderBlockFlow.cpp
Log Message:
-----------
[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
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
