Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: f551cda643c8a7b7f3a45ccb41332c1ba310eff2
https://github.com/WebKit/WebKit/commit/f551cda643c8a7b7f3a45ccb41332c1ba310eff2
Author: Alan Baradlay <[email protected]>
Date: 2025-11-17 (Mon, 17 Nov 2025)
Changed paths:
A
LayoutTests/fast/inline/blocks-in-inline-trailing-block-with-margin-expected.html
A LayoutTests/fast/inline/blocks-in-inline-trailing-block-with-margin.html
M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
Log Message:
-----------
[blocks-in-inline] Trailing block should contribute to root's content box
height
https://bugs.webkit.org/show_bug.cgi?id=302594
Reviewed by Antti Koivisto.
Mark non-zero height block box's line "contentful" so that we pick its geometry
up
when computing root's content box height.
Test: fast/inline/blocks-in-inline-trailing-block-with-margin.html
*
LayoutTests/fast/inline/blocks-in-inline-trailing-block-with-margin-expected.html:
Added.
* LayoutTests/fast/inline/blocks-in-inline-trailing-block-with-margin.html:
Added.
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::build):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::lastLineWithInflowContent):
(WebCore::LayoutIntegration::LineLayout::contentLogicalHeight const):
(WebCore::LayoutIntegration::LineLayout::lastLineBaseline const):
(WebCore::LayoutIntegration::lastLineWithInlineContent): Deleted.
Canonical link: https://commits.webkit.org/303116@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
