Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 5c155629379769f85bc165032d22e201a92d2160
https://github.com/WebKit/WebKit/commit/5c155629379769f85bc165032d22e201a92d2160
Author: Alan Baradlay <[email protected]>
Date: 2023-10-03 (Tue, 03 Oct 2023)
Changed paths:
M Source/WebCore/layout/LayoutState.cpp
M Source/WebCore/layout/LayoutState.h
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
M
Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.h
M Source/WebCore/layout/formattingContexts/inline/InlineLayoutState.h
M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h
M
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp
M
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.h
M Source/WebCore/layout/formattingContexts/inline/InlineQuirks.cpp
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp
M
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.h
M Source/WebCore/rendering/RenderView.cpp
Log Message:
-----------
[IFC][Cleanup] Populate inline layout state (using LayoutState)
https://bugs.webkit.org/show_bug.cgi?id=262450
Reviewed by Antti Koivisto.
Let's not consult the global layout state (renaming is coming up soon) in core
inline layout
but instead transfer the inline layout related bits to inline-layout-state.
* Source/WebCore/layout/LayoutState.cpp:
(WebCore::Layout::LayoutState::LayoutState):
(WebCore::Layout::LayoutState::formattingStateForFormattingContext const):
(WebCore::Layout::LayoutState::formattingStateForFlexFormattingContext const):
(WebCore::Layout::LayoutState::ensureFlexFormattingState):
(WebCore::Layout::LayoutState::shouldNotSynthesizeInlineBlockBaseline const):
Deleted.
* Source/WebCore/layout/LayoutState.h:
(WebCore::Layout::LayoutState::isInlineFormattingContextIntegration const):
Deleted.
(WebCore::Layout::LayoutState::isFlexFormattingContextIntegration const):
Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::initializeLayoutState):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.cpp:
(WebCore::Layout::InlineFormattingGeometry::inlineLevelBoxAffectsLineBox const):
(WebCore::Layout::InlineFormattingGeometry::initialLineHeight const):
(WebCore::Layout::InlineFormattingGeometry::inlineLayoutState const):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingGeometry.h:
* Source/WebCore/layout/formattingContexts/inline/InlineLayoutState.h:
(WebCore::Layout::InlineLayoutState::setInStandardsMode):
(WebCore::Layout::InlineLayoutState::inStandardsMode const):
(WebCore::Layout::InlineLayoutState::setShouldSynthesizeInlineBlockBaseline):
(WebCore::Layout::InlineLayoutState::shouldSynthesizeInlineBlockBaseline const):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::setVerticalPropertiesForInlineLevelBox const):
(WebCore::Layout::LineBoxBuilder::constructInlineLevelBoxes):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.h:
(WebCore::Layout::LineBoxBuilder::blockLayoutState const):
(WebCore::Layout::LineBoxBuilder::layoutState const): Deleted.
*
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp:
(WebCore::Layout::LineBoxVerticalAligner::computeLogicalHeightAndAlign const):
*
Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.h:
(WebCore::Layout::LineBoxVerticalAligner::inlineLayoutState const):
(WebCore::Layout::LineBoxVerticalAligner::layoutState const): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineQuirks.cpp:
(WebCore::Layout::InlineQuirks::initialLineHeight const):
(WebCore::Layout::InlineQuirks::inlineBoxAffectsLineBox const):
*
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:
(WebCore::Layout::InlineDisplayLineBuilder::collectEnclosingLineGeometry const):
*
Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.h:
(WebCore::Layout::InlineDisplayLineBuilder::root const):
(WebCore::Layout::InlineDisplayLineBuilder::layoutState const): Deleted.
* Source/WebCore/rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
Canonical link: https://commits.webkit.org/268788@main
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
