Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 75f3ee447b19e4e2d205b2719a360bc71a1385b0
https://github.com/WebKit/WebKit/commit/75f3ee447b19e4e2d205b2719a360bc71a1385b0
Author: Alan Baradlay <[email protected]>
Date: 2025-11-15 (Sat, 15 Nov 2025)
Changed paths:
M Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
Log Message:
-----------
[blocks-in-inline] Add MarginState to BlockLayoutState
https://bugs.webkit.org/show_bug.cgi?id=302572
Reviewed by Antti Koivisto.
This is in preparation for supporting margin collapsing.
MarginState will track render tree's MarginInfo across block ranges inside
block-in-inline content.
* Source/WebCore/layout/formattingContexts/block/BlockLayoutState.h:
(WebCore::Layout::BlockLayoutState::BlockLayoutState):
(WebCore::Layout::BlockLayoutState::marginState):
(WebCore::Layout::BlockLayoutState::marginState const):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::lineLayout):
(WebCore::Layout::InlineFormattingContext::updateLayoutStateWithLineLayoutResult):
(WebCore::Layout::InlineFormattingContext::updateInlineLayoutStateWithLineLayoutResult):
Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::computeIntrinsicWidthConstraints):
(WebCore::LayoutIntegration::initialMarginState):
(WebCore::LayoutIntegration::LineLayout::layout):
Canonical link: https://commits.webkit.org/303081@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
