Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 8335d774e6098f8df97995710d3d14b5b5b5c342
https://github.com/WebKit/WebKit/commit/8335d774e6098f8df97995710d3d14b5b5b5c342
Author: Antti Koivisto <[email protected]>
Date: 2025-11-18 (Tue, 18 Nov 2025)
Changed paths:
A
LayoutTests/fast/inline/blocks-in-inline-multicol-block-adjust-expected.html
A LayoutTests/fast/inline/blocks-in-inline-multicol-block-adjust.html
M Source/WebCore/layout/integration/inline/InlineIteratorBox.h
M Source/WebCore/layout/integration/inline/InlineIteratorBoxLegacyPath.h
M Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h
M Source/WebCore/rendering/RenderBlockFlow.cpp
M Source/WebCore/rendering/RenderBox.cpp
Log Message:
-----------
[blocks-in-inline] Ignore blocks in line level pagination
https://bugs.webkit.org/show_bug.cgi?id=302698
rdar://164946941
Reviewed by Alan Baradlay.
Test: fast/inline/blocks-in-inline-multicol-block-adjust.html
* LayoutTests/fast/inline/blocks-in-inline-multicol-block-adjust-expected.html:
Added.
* LayoutTests/fast/inline/blocks-in-inline-multicol-block-adjust.html: Added.
* Source/WebCore/layout/integration/inline/InlineIteratorBox.h:
(WebCore::InlineIterator::Box::isBlockLevelBox const):
Add inline iterator accessor to see block level boxes.
* Source/WebCore/layout/integration/inline/InlineIteratorBoxLegacyPath.h:
(WebCore::InlineIterator::BoxLegacyPath::isBlockLevelBox const):
* Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h:
(WebCore::InlineIterator::BoxModernPath::isBlockLevelBox const):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeLineAdjustmentForPagination):
Don't adjust lines that have block level content. Block layout code handles the
adjustments.
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalHeight const):
Drive-by crash fix.
Canonical link: https://commits.webkit.org/303183@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
