Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: ceedcf9540dd3e152256d681193cb5921c7aa37f
https://github.com/WebKit/WebKit/commit/ceedcf9540dd3e152256d681193cb5921c7aa37f
Author: Antti Koivisto <[email protected]>
Date: 2026-10-12 (Mon, 12 Oct 2026)
Changed paths:
M Source/WebCore/Headers.cmake
M Source/WebCore/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/accessibility/AccessibilityRenderObject.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorBox.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorBox.h
M Source/WebCore/layout/integration/inline/InlineIteratorBoxInlines.h
R Source/WebCore/layout/integration/inline/InlineIteratorBoxPath.h
R Source/WebCore/layout/integration/inline/InlineIteratorBoxPathInlines.h
M Source/WebCore/layout/integration/inline/InlineIteratorInlineBox.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorInlineBox.h
M Source/WebCore/layout/integration/inline/InlineIteratorLineBox.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h
M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxInlines.h
R Source/WebCore/layout/integration/inline/InlineIteratorLineBoxPath.h
M Source/WebCore/layout/integration/inline/InlineIteratorSVGTextBox.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorSVGTextBox.h
M Source/WebCore/layout/integration/inline/InlineIteratorTextBox.cpp
M Source/WebCore/layout/integration/inline/InlineIteratorTextBox.h
R Source/WebCore/layout/integration/inline/InlineIteratorTextBoxInlines.h
M
Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentPainter.cpp
M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
M Source/WebCore/rendering/CaretRectComputation.cpp
M Source/WebCore/rendering/RenderBoxModelObject.cpp
M Source/WebCore/rendering/RenderText.cpp
M Source/WebCore/rendering/TextBoxPainter.cpp
M Source/WebCore/rendering/TextBoxPainter.h
M Source/WebCore/rendering/TextPainter.cpp
M Source/WebCore/rendering/svg/RenderSVGText.cpp
M Source/WebCore/rendering/svg/SVGTextBoxPainter.cpp
M Source/WebCore/rendering/svg/SVGTextBoxPainter.h
M Source/WebKit/WebKitUIProcessPrefix.h
Log Message:
-----------
[IFC] Simplify InlineIterator
https://bugs.webkit.org/show_bug.cgi?id=327269
rdar://189825333
Reviewed by Alan Baradlay.
We don't need a separate Path object now that there is only one IFC path.
* Source/WebCore/Headers.cmake:
* Source/WebCore/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/accessibility/AccessibilityRenderObject.cpp:
* Source/WebCore/layout/integration/inline/InlineIteratorBox.cpp:
(WebCore::InlineIterator::BoxIterator::operator== const):
(WebCore::InlineIterator::BoxIterator::atEnd const):
(WebCore::InlineIterator::BoxIterator::traverseLineRightwardOnLine):
(WebCore::InlineIterator::BoxIterator::traverseLineRightwardOnLineSkippingChildren):
(WebCore::InlineIterator::BoxIterator::traverseLineLeftwardOnLine):
(WebCore::InlineIterator::Box::parentInlineBox const):
(WebCore::InlineIterator::Box::lineBox const):
(WebCore::InlineIterator::LeafBoxIterator::traverseLineRightwardOnLine):
(WebCore::InlineIterator::LeafBoxIterator::traverseLineLeftwardOnLine):
(WebCore::InlineIterator::boxFor):
* Source/WebCore/layout/integration/inline/InlineIteratorBox.h:
(WebCore::InlineIterator::Box::displayBox const):
(WebCore::InlineIterator::Box::boxIndex const):
(WebCore::InlineIterator::Box::inlineContent const):
(WebCore::InlineIterator::Box::atEnd const):
(WebCore::InlineIterator::Box::line const):
(WebCore::InlineIterator::Box::setAtEnd):
(WebCore::InlineIterator::Box::displayBoxes const):
(WebCore::InlineIterator::Box::Box):
(WebCore::InlineIterator::Box::isText const):
(WebCore::InlineIterator::Box::isInlineBox const):
(WebCore::InlineIterator::Box::isRootInlineBox const):
(WebCore::InlineIterator::Box::isRubyBase const):
(WebCore::InlineIterator::Box::visualRectIgnoringBlockDirection const):
(WebCore::InlineIterator::Box::isLineBreak const):
(WebCore::InlineIterator::Box::isBlockLevelBox const):
(WebCore::InlineIterator::Box::isAtomicInlineBox const):
(WebCore::InlineIterator::Box::minimumCaretOffset const):
(WebCore::InlineIterator::Box::maximumCaretOffset const):
(WebCore::InlineIterator::Box::bidiLevel const):
(WebCore::InlineIterator::Box::lineIndex const):
(WebCore::InlineIterator::Box::renderer const):
(WebCore::InlineIterator::Box::hasRenderer const):
(WebCore::InlineIterator::Box::formattingContextRoot const):
(WebCore::InlineIterator::Box::style const):
(WebCore::InlineIterator::Box::traverseNextTextBox):
(WebCore::InlineIterator::Box::traverseNextLeafOnLine):
(WebCore::InlineIterator::Box::traversePreviousLeafOnLine):
(WebCore::InlineIterator::Box::traverseNextInlineBox):
(WebCore::InlineIterator::Box::traversePreviousInlineBox):
(WebCore::InlineIterator::Box::traverseNextBoxOnLine):
(WebCore::InlineIterator::Box::traverseNextBoxOnLineSkippingChildren):
(WebCore::InlineIterator::Box::traversePreviousBoxOnLine):
(WebCore::InlineIterator::Box::firstLeafBoxForInlineBox const):
(WebCore::InlineIterator::Box::lastLeafBoxForInlineBox const):
(WebCore::InlineIterator::Box::isWithinInlineBox const):
(WebCore::InlineIterator::Box::traverseNextBox):
(WebCore::InlineIterator::Box::traversePreviousBox):
(WebCore::InlineIterator::Box::traverseNextLeaf):
(WebCore::InlineIterator::Box::traversePreviousLeaf):
(WebCore::InlineIterator::Box::traverseNextWithSameLayoutBox):
(WebCore::InlineIterator::Box::traversePreviousWithSameLayoutBox):
(WebCore::InlineIterator::BoxIterator::BoxIterator): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorBoxInlines.h:
(WebCore::InlineIterator::Box::isHorizontal const):
* Source/WebCore/layout/integration/inline/InlineIteratorBoxPath.h: Removed.
* Source/WebCore/layout/integration/inline/InlineIteratorBoxPathInlines.h:
Removed.
* Source/WebCore/layout/integration/inline/InlineIteratorInlineBox.cpp:
(WebCore::InlineIterator::InlineBox::InlineBox):
(WebCore::InlineIterator::InlineBox::closedEdges const):
(WebCore::InlineIterator::InlineBox::firstLeafBox const):
(WebCore::InlineIterator::InlineBox::lastLeafBox const):
(WebCore::InlineIterator::InlineBoxIterator::traverseInlineBoxLineRightward):
(WebCore::InlineIterator::InlineBoxIterator::traverseInlineBoxLineLeftward):
(WebCore::InlineIterator::inlineBoxFor):
* Source/WebCore/layout/integration/inline/InlineIteratorInlineBox.h:
* Source/WebCore/layout/integration/inline/InlineIteratorLineBox.cpp:
(WebCore::InlineIterator::LineBoxIterator::atEnd const):
(WebCore::InlineIterator::LineBoxIterator::traverseNext):
(WebCore::InlineIterator::LineBoxIterator::traversePrevious):
(WebCore::InlineIterator::LineBoxIterator::operator== const):
(WebCore::InlineIterator::lineBoxFor):
(WebCore::InlineIterator::LineBox::lineLeftmostLeafBox const):
(WebCore::InlineIterator::LineBox::lineRightmostLeafBox const):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h:
(WebCore::InlineIterator::LineBox::lineIndex const):
(WebCore::InlineIterator::LineBox::atEnd const):
(WebCore::InlineIterator::LineBox::setAtEnd):
(WebCore::InlineIterator::LineBox::LineBox):
(WebCore::InlineIterator::LineBox::contentLogicalTop const):
(WebCore::InlineIterator::LineBox::contentLogicalBottom const):
(WebCore::InlineIterator::LineBox::contentLogicalTopAdjustedForPrecedingLineBox
const):
(WebCore::InlineIterator::LineBox::contentLogicalBottomAdjustedForFollowingLineBox
const):
(WebCore::InlineIterator::LineBox::logicalTop const):
(WebCore::InlineIterator::LineBox::logicalBottom const):
(WebCore::InlineIterator::LineBox::logicalWidth const):
(WebCore::InlineIterator::LineBox::inkOverflowLogicalTop const):
(WebCore::InlineIterator::LineBox::inkOverflowLogicalBottom const):
(WebCore::InlineIterator::LineBox::scrollableOverflowTop const):
(WebCore::InlineIterator::LineBox::scrollableOverflowBottom const):
(WebCore::InlineIterator::LineBox::hasEllipsis const):
(WebCore::InlineIterator::LineBox::ellipsisVisualRect const):
(WebCore::InlineIterator::LineBox::ellipsisText const):
(WebCore::InlineIterator::LineBox::contentLogicalLeft const):
(WebCore::InlineIterator::LineBox::contentLogicalRight const):
(WebCore::InlineIterator::LineBox::isHorizontal const):
(WebCore::InlineIterator::LineBox::baselineType const):
(WebCore::InlineIterator::LineBox::formattingContextRoot const):
(WebCore::InlineIterator::LineBox::isFirstAfterPageBreak const):
(WebCore::InlineIterator::LineBox::hasBlockContent const):
(WebCore::InlineIterator::LineBox::hasContentfulInFlowBox const):
(WebCore::InlineIterator::LineBox::lineEllipsis const):
(WebCore::InlineIterator::LineBoxIterator::LineBoxIterator): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxInlines.h:
(WebCore::InlineIterator::LineBox::lineIndex const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxPath.h: Removed.
* Source/WebCore/layout/integration/inline/InlineIteratorSVGTextBox.cpp:
(WebCore::InlineIterator::SVGTextBox::SVGTextBox):
(WebCore::InlineIterator::SVGTextBox::textFragments const):
(WebCore::InlineIterator::svgTextBoxFor):
* Source/WebCore/layout/integration/inline/InlineIteratorSVGTextBox.h:
* Source/WebCore/layout/integration/inline/InlineIteratorTextBox.cpp:
(WebCore::InlineIterator::TextBoxIterator::traverseNextTextBox):
(WebCore::InlineIterator::textBoxFor):
(WebCore::InlineIterator::TextBox::textRun const):
* Source/WebCore/layout/integration/inline/InlineIteratorTextBox.h:
(WebCore::InlineIterator::TextBox::TextBox):
(WebCore::InlineIterator::TextBox::hasHyphen const):
(WebCore::InlineIterator::TextBox::originalText const):
(WebCore::InlineIterator::TextBox::start const):
(WebCore::InlineIterator::TextBox::end const):
(WebCore::InlineIterator::TextBox::length const):
(WebCore::InlineIterator::TextBox::selectableRange const):
* Source/WebCore/layout/integration/inline/InlineIteratorTextBoxInlines.h:
Removed.
*
Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentPainter.cpp:
(WebCore::LayoutIntegration::InlineContentPainter::paintEllipsis):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::lastBox const):
(WebCore::LayoutIntegration::LineLayout::firstLineBox const):
(WebCore::LayoutIntegration::LineLayout::lastLineBox const):
* Source/WebCore/rendering/CaretRectComputation.cpp:
* Source/WebCore/rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
* Source/WebCore/rendering/RenderText.cpp:
* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::buildTextForShaping):
(WebCore::TextBoxPainter::TextBoxPainter):
(WebCore::TextBoxPainter::makeIterator const):
(WebCore::TextBoxPainter::selectionRectForRange const):
(WebCore::TextBoxPainter::hasSynthesizedGlyph const):
(WebCore::TextBoxPainter::paintForeground):
(WebCore::TextBoxPainter::paintForegroundForShapeRange):
(WebCore::textBoxFragmentLocationWithinLayoutBox):
(WebCore::TextBoxPainter::isInsideShapedContent const):
(WebCore::m_isCombinedText): Deleted.
* Source/WebCore/rendering/TextBoxPainter.h:
* Source/WebCore/rendering/TextPainter.cpp:
(WebCore::TextPainter::cachedGlyphDisplayListsForTextNodeAsText):
* Source/WebCore/rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::paintInlineChildren):
* Source/WebCore/rendering/svg/SVGTextBoxPainter.cpp:
(WebCore::SVGTextBoxPainter::SVGTextBoxPainter):
(WebCore::SVGTextBoxPainter::textBoxIterator const):
* Source/WebCore/rendering/svg/SVGTextBoxPainter.h:
* Source/WebKit/WebKitUIProcessPrefix.h:
Canonical link: https://commits.webkit.org/323500@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
