[webkit-changes] [WebKit/WebKit] bd1514: [IFC][Integration] Remove LayoutIntegration::Line
Alan Baradlay
noreply at github.com
Wed Feb 8 05:39:16 PST 2023
Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: bd1514eea9628a0a453d03cf2d48ecf6800ce215
https://github.com/WebKit/WebKit/commit/bd1514eea9628a0a453d03cf2d48ecf6800ce215
Author: Alan Baradlay <zalan at apple.com>
Date: 2023-02-08 (Wed, 08 Feb 2023)
Changed paths:
M Source/WebCore/Headers.cmake
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h
M Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp
M Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.h
M Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h
M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h
M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.h
M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.h
R Source/WebCore/layout/integration/inline/LayoutIntegrationLine.h
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h
M Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.cpp
M Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp
Log Message:
-----------
[IFC][Integration] Remove LayoutIntegration::Line
https://bugs.webkit.org/show_bug.cgi?id=251850
Reviewed by Antti Koivisto.
It's redundant, use InlineDisplay::Line instead (this is similar to how we manage InlineDisplay::Box at integration layer).
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLine.h:
(WebCore::InlineDisplay::Line::lineBoxTop const):
(WebCore::InlineDisplay::Line::lineBoxBottom const):
(WebCore::InlineDisplay::Line::lineBoxLeft const):
(WebCore::InlineDisplay::Line::lineBoxRight const):
(WebCore::InlineDisplay::Line::lineBoxHeight const):
(WebCore::InlineDisplay::Line::lineBoxWidth const):
(WebCore::InlineDisplay::Line::inkOverflow const):
(WebCore::InlineDisplay::Line::enclosingContentLogicalTop const):
(WebCore::InlineDisplay::Line::enclosingContentLogicalBottom const):
(WebCore::InlineDisplay::Line::hasEllipsis const):
(WebCore::InlineDisplay::Line::ellipsisText const):
(WebCore::InlineDisplay::Line::firstBoxIndex const):
(WebCore::InlineDisplay::Line::boxCount const):
(WebCore::InlineDisplay::Line::isFirstAfterPageBreak const):
(WebCore::InlineDisplay::Line::setFirstBoxIndex):
(WebCore::InlineDisplay::Line::setBoxCount):
(WebCore::InlineDisplay::Line::setIsFirstAfterPageBreak):
(WebCore::InlineDisplay::Line::setInkOverflow):
(WebCore::InlineDisplay::Line::adjustScrollableOverflow):
(WebCore::InlineDisplay::Line::Line):
(WebCore::InlineDisplay::Line::moveVertically):
(WebCore::InlineDisplay::Line::visibleRectIgnoringBlockDirection const):
(WebCore::InlineDisplay::Line::enclosingLogicalTopAndBottom const): Deleted.
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:
(WebCore::Layout::InlineDisplayLineBuilder::build const):
* Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h:
(WebCore::InlineIterator::BoxModernPath::line const):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h:
(WebCore::InlineIterator::LineBoxIteratorModernPath::ellipsisVisualRectIgnoringBlockDirection const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::line const):
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.h:
(WebCore::LayoutIntegration::InlineContent::lineForBox const):
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.cpp:
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLine.h: Removed.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::physicalBaselineForLine const):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationPagination.cpp:
(WebCore::LayoutIntegration::makeAdjustedContent):
* Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::showInlineTreeAndRuns):
Canonical link: https://commits.webkit.org/260002@main
More information about the webkit-changes
mailing list