Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: fa3a2366d452d578c099ff967e5397d8ca255d4a
https://github.com/WebKit/WebKit/commit/fa3a2366d452d578c099ff967e5397d8ca255d4a
Author: Alan Baradlay <[email protected]>
Date: 2026-10-12 (Mon, 12 Oct 2026)
Changed paths:
M Source/WebCore/CMakeLists.txt
M Source/WebCore/Headers.cmake
M Source/WebCore/PlatformCocoa.cmake
M Source/WebCore/SaferCPPExpectations/MemoryUnsafeCastCheckerExpectations
M Source/WebCore/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations
M Source/WebCore/SaferCPPExpectations/UncheckedLocalVarsCheckerExpectations
M Source/WebCore/Sources.txt
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
R Source/WebCore/layout/FormattingState.cpp
R Source/WebCore/layout/FormattingState.h
R Source/WebCore/layout/LayoutContext.cpp
R Source/WebCore/layout/LayoutContext.h
R Source/WebCore/layout/LayoutPhase.cpp
R Source/WebCore/layout/LayoutPhase.h
M Source/WebCore/layout/LayoutState.cpp
M Source/WebCore/layout/LayoutState.h
M Source/WebCore/layout/floats/FloatingContext.cpp
M Source/WebCore/layout/floats/FloatingContext.h
M Source/WebCore/layout/formattingContexts/FormattingConstraints.h
R Source/WebCore/layout/formattingContexts/FormattingContext.cpp
R Source/WebCore/layout/formattingContexts/FormattingContext.h
R Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp
R Source/WebCore/layout/formattingContexts/FormattingGeometry.h
R Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp
R Source/WebCore/layout/formattingContexts/FormattingQuirks.h
R Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp
R Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.h
R Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp
R Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.h
R Source/WebCore/layout/formattingContexts/block/BlockFormattingQuirks.cpp
R Source/WebCore/layout/formattingContexts/block/BlockFormattingQuirks.h
M Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp
M Source/WebCore/layout/formattingContexts/block/BlockFormattingState.h
R Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp
R Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.h
R
Source/WebCore/layout/formattingContexts/block/PrecomputedBlockMarginCollapse.cpp
R
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.cpp
R
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.h
R
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.cpp
R
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.h
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp
R
Source/WebCore/layout/formattingContexts/table/TableFormattingConstraints.h
R Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp
R Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h
R Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp
R Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.h
R Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp
R Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.h
R Source/WebCore/layout/formattingContexts/table/TableFormattingState.cpp
R Source/WebCore/layout/formattingContexts/table/TableFormattingState.h
R Source/WebCore/layout/formattingContexts/table/TableGrid.cpp
R Source/WebCore/layout/formattingContexts/table/TableGrid.h
R Source/WebCore/layout/formattingContexts/table/TableLayout.cpp
M Source/WebCore/layout/layouttree/LayoutBox.cpp
M Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h
M Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.cpp
M Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.h
M Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp
M Source/WebCore/layout/layouttree/LayoutTreeBuilder.h
M Source/WebCore/page/LocalFrameView.cpp
M Source/WebCore/page/LocalFrameViewLayoutContext.cpp
M Source/WebCore/page/cocoa/PageCocoa.mm
M
Source/WebKit/Resources/cocoa/NotificationAllowList/ForwardedNotifications.def
Log Message:
-----------
[BFC] Remove the LFC block and table formatting contexts
https://bugs.webkit.org/show_bug.cgi?id=327201
<rdar://problem/189777764>
Reviewed by Antti Koivisto.
The old LFC block, table wrapper and table formatting contexts have had no
callers since the full-LFC layout path went away.
Let's remove all of it, together with the FormattingContext, FormattingGeometry
and FormattingQuirks base classes, LayoutContext, LayoutPhase, the
whole-document TreeBuilder and the notify hook. This clears the ground for the
new block formatting context.
* Source/WebCore/CMakeLists.txt:
* Source/WebCore/Headers.cmake:
* Source/WebCore/PlatformCocoa.cmake:
* Source/WebCore/SaferCPPExpectations/MemoryUnsafeCastCheckerExpectations:
* Source/WebCore/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations:
* Source/WebCore/SaferCPPExpectations/UncheckedLocalVarsCheckerExpectations:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/layout/FormattingState.cpp: Removed.
* Source/WebCore/layout/FormattingState.h: Removed.
* Source/WebCore/layout/LayoutContext.cpp: Removed.
* Source/WebCore/layout/LayoutContext.h: Removed.
* Source/WebCore/layout/LayoutPhase.cpp: Removed.
* Source/WebCore/layout/LayoutPhase.h: Removed.
* Source/WebCore/layout/LayoutState.cpp:
(WebCore::Layout::LayoutState::ensureBlockFormattingState):
(WebCore::Layout::LayoutState::hasFormattingState const): Deleted.
(WebCore::Layout::LayoutState::formattingStateForFormattingContext const):
Deleted.
(WebCore::Layout::LayoutState::formattingStateForBlockFormattingContext const):
Deleted.
(WebCore::Layout::LayoutState::formattingStateForTableFormattingContext const):
Deleted.
(WebCore::Layout::LayoutState::ensureTableFormattingState): Deleted.
* Source/WebCore/layout/LayoutState.h:
(WebCore::Layout::LayoutState::deregisterFormattingContext): Deleted.
(WebCore::Layout::LayoutState::registerFormattingContext): Deleted.
* Source/WebCore/layout/floats/FloatingContext.cpp:
(WebCore::Layout::FloatingContext::blockAxisPositionWithClearance const):
(WebCore::Layout::FloatingContext::absoluteCoordinates const):
(WebCore::Layout::FloatingContext::mapPointFromFloatingContextRootToBlockFormattingContextRoot
const):
* Source/WebCore/layout/floats/FloatingContext.h:
* Source/WebCore/layout/formattingContexts/FormattingConstraints.h:
(WebCore::Layout::ConstraintsForInFlowContent::isConstraintsForInlineContent
const):
(WebCore::Layout::ConstraintsForInFlowContent::isConstraintsForTableContent
const): Deleted.
(WebCore::Layout::ConstraintsForInFlowContent::isConstraintsForFlexContent
const): Deleted.
* Source/WebCore/layout/formattingContexts/FormattingContext.cpp: Removed.
* Source/WebCore/layout/formattingContexts/FormattingContext.h: Removed.
* Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp: Removed.
* Source/WebCore/layout/formattingContexts/FormattingGeometry.h: Removed.
* Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp: Removed.
* Source/WebCore/layout/formattingContexts/FormattingQuirks.h: Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.h:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.h:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingQuirks.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingQuirks.h:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockFormattingState.cpp:
(WebCore::Layout::BlockFormattingState::BlockFormattingState):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingState.h:
(WebCore::Layout::BlockFormattingState::addOutOfFlowBox): Deleted.
(WebCore::Layout::BlockFormattingState::setOutOfFlowBoxes): Deleted.
(WebCore::Layout::BlockFormattingState::setUsedVerticalMargin): Deleted.
(WebCore::Layout::BlockFormattingState::usedVerticalMargin const): Deleted.
(WebCore::Layout::BlockFormattingState::hasUsedVerticalMargin const): Deleted.
(WebCore::Layout::BlockFormattingState::setHasClearance): Deleted.
(WebCore::Layout::BlockFormattingState::clearHasClearance): Deleted.
(WebCore::Layout::BlockFormattingState::hasClearance const): Deleted.
* Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.h: Removed.
*
Source/WebCore/layout/formattingContexts/block/PrecomputedBlockMarginCollapse.cpp:
Removed.
*
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.cpp:
Removed.
*
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingContext.h:
Removed.
*
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.cpp:
Removed.
*
Source/WebCore/layout/formattingContexts/block/tablewrapper/TableWrapperBlockFormattingQuirks.h:
Removed.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp:
*
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::InlineDisplayContentBuilder):
* Source/WebCore/layout/formattingContexts/table/TableFormattingConstraints.h:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.h:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.h:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingState.cpp:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableFormattingState.h:
Removed.
* Source/WebCore/layout/formattingContexts/table/TableGrid.cpp: Removed.
* Source/WebCore/layout/formattingContexts/table/TableGrid.h: Removed.
* Source/WebCore/layout/formattingContexts/table/TableLayout.cpp: Removed.
* Source/WebCore/layout/layouttree/LayoutBox.cpp:
(WebCore::Layout::Box::establishesFormattingContext const):
(WebCore::Layout::containingBlock):
* Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h:
(WebCore::Layout::LayoutContainingBlockChainIterator::operator++):
(WebCore::Layout::containingBlockChain):
* Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.cpp:
(WebCore::Layout::initialContainingBlock):
* Source/WebCore/layout/layouttree/LayoutInitialContainingBlock.h:
* Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::showLayoutTree):
(WebCore::Layout::LayoutTree::LayoutTree): Deleted.
(WebCore::Layout::appendChild): Deleted.
(WebCore::Layout::canUseSimplifiedTextMeasuringForCharacters): Deleted.
(WebCore::Layout::canUseSimplifiedTextMeasuring): Deleted.
(WebCore::Layout::TreeBuilder::buildLayoutTree): Deleted.
(WebCore::Layout::TreeBuilder::createReplacedBox): Deleted.
(WebCore::Layout::TreeBuilder::createTextBox): Deleted.
(WebCore::Layout::TreeBuilder::createContainer): Deleted.
(WebCore::Layout::TreeBuilder::createLayoutBox): Deleted.
(WebCore::Layout::TreeBuilder::buildTableStructure): Deleted.
(WebCore::Layout::TreeBuilder::buildSubTree): Deleted.
(WebCore::Layout::printLayoutTreeForLiveDocuments): Deleted.
* Source/WebCore/layout/layouttree/LayoutTreeBuilder.h:
(WebCore::Layout::LayoutTree::root const): Deleted.
* Source/WebCore/page/LocalFrameView.cpp:
* Source/WebCore/page/LocalFrameViewLayoutContext.cpp:
* Source/WebCore/page/cocoa/PageCocoa.mm:
(WebCore::Page::platformInitialize):
*
Source/WebKit/Resources/cocoa/NotificationAllowList/ForwardedNotifications.def:
Canonical link: https://commits.webkit.org/323456@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
