Changeset 291548 in webkit

Timestamp:

Mar 20, 2022, 5:59:06 PM (5 years ago)

Author:

Alan Bujtas

Message:

[IFC][Integration] Rename InlineIterator::Line to LineBox
​https://bugs.webkit.org/show_bug.cgi?id=238128

Reviewed by Antti Koivisto.

• dom/Position.cpp:

(WebCore::Position::upstream const):
(WebCore::Position::downstream const):
(WebCore::Position::rendersInDifferentPosition const):

• editing/RenderedPosition.h:

(WebCore::RenderedPosition::lineBox const):
(WebCore::RenderedPosition::line const): Deleted.

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::leftVisuallyDistinctCandidate const):
(WebCore::VisiblePosition::rightVisuallyDistinctCandidate const):
(WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):

• editing/VisibleUnits.cpp:

(WebCore::startTextOrLineBreakBox):
(WebCore::endTextOrLineBreakBox):
(WebCore::logicallyPreviousBox):
(WebCore::logicallyNextBox):
(WebCore::startPositionForLine):
(WebCore::endPositionForLine):
(WebCore::absoluteLineDirectionPointToLocalPointInBlock):
(WebCore::previousLinePosition):
(WebCore::nextLinePosition):

• html/HTMLTextFormControlElement.cpp:

(WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks const):

• layout/integration/InlineIteratorBox.cpp:

(WebCore::InlineIterator::Box::lineBox const):
(WebCore::InlineIterator::Box::style const):
(WebCore::InlineIterator::Box::line const): Deleted.

• layout/integration/InlineIteratorBox.h:
• layout/integration/InlineIteratorLine.cpp:

(WebCore::InlineIterator::LineBoxIterator::LineBoxIterator):
(WebCore::InlineIterator::LineBoxIterator::atEnd const):
(WebCore::InlineIterator::LineBoxIterator::traverseNext):
(WebCore::InlineIterator::LineBoxIterator::traversePrevious):
(WebCore::InlineIterator::LineBoxIterator::operator== const):
(WebCore::InlineIterator::firstLineBoxFor):
(WebCore::InlineIterator::lastLineBoxFor):
(WebCore::InlineIterator::LineBox::next const):
(WebCore::InlineIterator::LineBox::previous const):
(WebCore::InlineIterator::LineBox::firstLeafBox const):
(WebCore::InlineIterator::LineBox::lastLeafBox const):
(WebCore::InlineIterator::closestBoxForHorizontalPosition):
(WebCore::InlineIterator::LineIterator::LineIterator): Deleted.
(WebCore::InlineIterator::LineIterator::atEnd const): Deleted.
(WebCore::InlineIterator::LineIterator::traverseNext): Deleted.
(WebCore::InlineIterator::LineIterator::traversePrevious): Deleted.
(WebCore::InlineIterator::LineIterator::operator== const): Deleted.
(WebCore::InlineIterator::firstLineFor): Deleted.
(WebCore::InlineIterator::lastLineFor): Deleted.
(WebCore::InlineIterator::Line::next const): Deleted.
(WebCore::InlineIterator::Line::previous const): Deleted.
(WebCore::InlineIterator::Line::firstLeafBox const): Deleted.
(WebCore::InlineIterator::Line::lastLeafBox const): Deleted.

• layout/integration/InlineIteratorLine.h:

(WebCore::InlineIterator::LineBox::height const):
(WebCore::InlineIterator::LineBoxIterator::LineBoxIterator):
(WebCore::InlineIterator::LineBoxIterator::operator++):
(WebCore::InlineIterator::LineBoxIterator::operator!= const):
(WebCore::InlineIterator::LineBoxIterator::operator== const):
(WebCore::InlineIterator::LineBoxIterator::operator* const):
(WebCore::InlineIterator::LineBoxIterator::operator-> const):
(WebCore::InlineIterator::previousLineBoxContentBottomOrBorderAndPadding):
(WebCore::InlineIterator::contentStartInBlockDirection):
(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::top const):
(WebCore::InlineIterator::LineBox::bottom const):
(WebCore::InlineIterator::LineBox::contentLogicalLeft const):
(WebCore::InlineIterator::LineBox::contentLogicalRight const):
(WebCore::InlineIterator::LineBox::contentLogicalWidth const):
(WebCore::InlineIterator::LineBox::isHorizontal const):
(WebCore::InlineIterator::LineBox::baselineType const):
(WebCore::InlineIterator::LineBox::containingBlock const):
(WebCore::InlineIterator::LineBox::containingFragment const):
(WebCore::InlineIterator::LineBox::isFirstAfterPageBreak const):
(WebCore::InlineIterator::LineBox::isFirst const):
(WebCore::InlineIterator::Line::lineBoxHeight const): Deleted.
(WebCore::InlineIterator::LineIterator::LineIterator): Deleted.
(WebCore::InlineIterator::LineIterator::operator++): Deleted.
(WebCore::InlineIterator::LineIterator::operator bool const): Deleted.
(WebCore::InlineIterator::LineIterator::operator!= const): Deleted.
(WebCore::InlineIterator::LineIterator::operator== const): Deleted.
(WebCore::InlineIterator::LineIterator::operator* const): Deleted.
(WebCore::InlineIterator::LineIterator::operator-> const): Deleted.
(WebCore::InlineIterator::previousLineContentBottomOrBorderAndPadding): Deleted.
(WebCore::InlineIterator::Line::Line): Deleted.
(WebCore::InlineIterator::Line::contentLogicalTop const): Deleted.
(WebCore::InlineIterator::Line::contentLogicalBottom const): Deleted.
(WebCore::InlineIterator::Line::contentLogicalTopAdjustedForPrecedingLine const): Deleted.
(WebCore::InlineIterator::Line::contentLogicalBottomAdjustedForFollowingLine const): Deleted.
(WebCore::InlineIterator::Line::lineBoxTop const): Deleted.
(WebCore::InlineIterator::Line::lineBoxBottom const): Deleted.
(WebCore::InlineIterator::Line::contentLogicalLeft const): Deleted.
(WebCore::InlineIterator::Line::contentLogicalRight const): Deleted.
(WebCore::InlineIterator::Line::contentLogicalWidth const): Deleted.
(WebCore::InlineIterator::Line::isHorizontal const): Deleted.
(WebCore::InlineIterator::Line::baselineType const): Deleted.
(WebCore::InlineIterator::Line::containingBlock const): Deleted.
(WebCore::InlineIterator::Line::containingFragment const): Deleted.
(WebCore::InlineIterator::Line::isFirstAfterPageBreak const): Deleted.
(WebCore::InlineIterator::Line::isFirst const): Deleted.

• layout/integration/InlineIteratorLineLegacyPath.h:

(WebCore::InlineIterator::LineBoxIteratorLegacyPath::LineBoxIteratorLegacyPath):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::contentLogicalTopAdjustedForPrecedingLineBox const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::contentLogicalBottomAdjustedForFollowingLineBox const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::top const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::bottom const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::operator== const):
(WebCore::InlineIterator::LineIteratorLegacyPath::LineIteratorLegacyPath): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalTop const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalBottom const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalTopAdjustedForPrecedingLine const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalBottomAdjustedForFollowingLine const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::lineBoxTop const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::lineBoxBottom const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalLeft const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalRight const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::isHorizontal const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::baselineType const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::containingBlock const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::containingFragment const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::isFirstAfterPageBreak const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::traverseNext): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::traversePrevious): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::operator== const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::atEnd const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::firstLeafBox const): Deleted.
(WebCore::InlineIterator::LineIteratorLegacyPath::lastLeafBox const): Deleted.

• layout/integration/InlineIteratorLineModernPath.h:

(WebCore::InlineIterator::LineBoxIteratorModernPath::LineBoxIteratorModernPath):
(WebCore::InlineIterator::LineBoxIteratorModernPath::top const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::bottom const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::contentLogicalTopAdjustedForPrecedingLineBox const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::contentLogicalBottomAdjustedForFollowingLineBox const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::operator== const):
(WebCore::InlineIterator::LineIteratorModernPath::LineIteratorModernPath): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::contentLogicalTop const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::contentLogicalBottom const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::lineBoxTop const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::lineBoxBottom const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::contentLogicalTopAdjustedForPrecedingLine const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::contentLogicalBottomAdjustedForFollowingLine const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::contentLogicalLeft const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::contentLogicalRight const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::isHorizontal const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::baselineType const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::containingBlock const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::containingFragment const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::isFirstAfterPageBreak const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::traverseNext): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::traversePrevious): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::operator== const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::atEnd const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::firstLeafBox const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::lastLeafBox const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::setAtEnd): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::lines const): Deleted.
(WebCore::InlineIterator::LineIteratorModernPath::line const): Deleted.

• layout/integration/InlineIteratorLogicalOrderTraversal.cpp:

(WebCore::InlineIterator::makeLineLogicalOrderCache):
(WebCore::InlineIterator::updateLineLogicalOrderCacheIfNeeded):
(WebCore::InlineIterator::firstLeafOnLineInLogicalOrder):
(WebCore::InlineIterator::lastLeafOnLineInLogicalOrder):
(WebCore::InlineIterator::firstLeafOnLineInLogicalOrderWithNode):
(WebCore::InlineIterator::lastLeafOnLineInLogicalOrderWithNode):

• layout/integration/InlineIteratorLogicalOrderTraversal.h:

(WebCore::InlineIterator::leafBoxesInLogicalOrder):

• layout/integration/InlineIteratorTextBox.cpp:

(WebCore::InlineIterator::TextBox::selectionRect const):

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::firstLineBox const):
(WebCore::LayoutIntegration::LineLayout::lastLineBox const):
(WebCore::LayoutIntegration::LineLayout::firstLine const): Deleted.
(WebCore::LayoutIntegration::LineLayout::lastLine const): Deleted.

• layout/integration/LayoutIntegrationLineLayout.h:
• layout/integration/LineSelection.h:

(WebCore::LineSelection::logicalTop):
(WebCore::LineSelection::logicalBottom):
(WebCore::LineSelection::logicalRect):
(WebCore::LineSelection::physicalRect):
(WebCore::LineSelection::logicalTopAdjustedForPrecedingBlock):
(WebCore::LineSelection::selectionState):

• rendering/CaretRectComputation.cpp:

(WebCore::computeCaretRectForLinePosition):
(WebCore::computeCaretRectForText):
(WebCore::computeCaretRectForLineBreak):
(WebCore::computeCaretRectForBox):

• rendering/InlineBoxPainter.cpp:

(WebCore::InlineBoxPainter::InlineBoxPainter):
(WebCore::InlineBoxPainter::paintMask):
(WebCore::InlineBoxPainter::paintDecorations):
(WebCore::InlineBoxPainter::style const):

• rendering/InlineBoxPainter.h:
• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::adjustEnclosingTopForPrecedingBlock const):
(WebCore::RenderBlockFlow::inlineSelectionGaps):
(WebCore::RenderBlockFlow::containsNonZeroBidiLevel const):
(WebCore::RenderBlockFlow::findClosestTextAtAbsolutePoint):
(WebCore::RenderBlockFlow::positionForPointWithInlineChildren):
(WebCore::RenderBlockFlow::addFocusRingRectsForInlineChildren):

• rendering/RenderElement.cpp:

(WebCore::RenderElement::getLeadingCorner const):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::paintOutline):

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::positionForPoint):

• rendering/RenderText.cpp:

(WebCore::RenderText::positionForPoint):

• rendering/TextBoxPainter.cpp:

(WebCore::TextBoxPainter::TextBoxPainter):
(WebCore::TextBoxPainter::paintBackground):
(WebCore::textPosition):
(WebCore::TextBoxPainter::computePaintRect):

• rendering/svg/SVGRootInlineBox.cpp:

(WebCore::SVGRootInlineBox::reorderValueListsToLogicalOrder):

• style/InlineTextBoxStyle.cpp:

(WebCore::minLogicalTopForTextDecorationLine):
(WebCore::maxLogicalBottomForTextDecorationLine):
(WebCore::computeUnderlineOffset):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Headers.cmake (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• dom/Position.cpp (modified) (4 diffs)
• editing/RenderedPosition.h (modified) (2 diffs)
• editing/VisiblePosition.cpp (modified) (6 diffs)
• editing/VisibleUnits.cpp (modified) (17 diffs)
• html/HTMLTextFormControlElement.cpp (modified) (3 diffs)
• layout/integration/InlineIteratorBox.cpp (modified) (3 diffs)
• layout/integration/InlineIteratorBox.h (modified) (2 diffs)
• layout/integration/InlineIteratorLine.cpp (modified) (7 diffs)
• layout/integration/InlineIteratorLineBox.h (moved) (moved from trunk/Source/WebCore/layout/integration/InlineIteratorLine.h ) (13 diffs)
• layout/integration/InlineIteratorLineBoxLegacyPath.h (moved) (moved from trunk/Source/WebCore/layout/integration/InlineIteratorLineLegacyPath.h ) (2 diffs)
• layout/integration/InlineIteratorLineBoxModernPath.h (moved) (moved from trunk/Source/WebCore/layout/integration/InlineIteratorLineModernPath.h ) (3 diffs)
• layout/integration/InlineIteratorLogicalOrderTraversal.cpp (modified) (7 diffs)
• layout/integration/InlineIteratorLogicalOrderTraversal.h (modified) (5 diffs)
• layout/integration/InlineIteratorTextBox.cpp (modified) (2 diffs)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.h (modified) (2 diffs)
• layout/integration/LineSelection.h (modified) (2 diffs)
• rendering/CaretRectComputation.cpp (modified) (5 diffs)
• rendering/InlineBoxPainter.cpp (modified) (5 diffs)
• rendering/InlineBoxPainter.h (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (14 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (2 diffs)
• rendering/RenderImage.cpp (modified) (2 diffs)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderLineBreak.cpp (modified) (2 diffs)
• rendering/RenderReplaced.cpp (modified) (2 diffs)
• rendering/RenderText.cpp (modified) (3 diffs)
• rendering/TextBoxPainter.cpp (modified) (5 diffs)
• rendering/svg/SVGRootInlineBox.cpp (modified) (1 diff)
• style/InlineTextBoxStyle.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-20  Alan Bujtas  <zalan@apple.com>
+
+        [IFC][Integration] Rename InlineIterator::Line to LineBox
+        https://bugs.webkit.org/show_bug.cgi?id=238128
+
+        Reviewed by Antti Koivisto.
+
+        * dom/Position.cpp:
+        (WebCore::Position::upstream const):
+        (WebCore::Position::downstream const):
+        (WebCore::Position::rendersInDifferentPosition const):
+        * editing/RenderedPosition.h:
+        (WebCore::RenderedPosition::lineBox const):
+        (WebCore::RenderedPosition::line const): Deleted.
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::leftVisuallyDistinctCandidate const):
+        (WebCore::VisiblePosition::rightVisuallyDistinctCandidate const):
+        (WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):
+        * editing/VisibleUnits.cpp:
+        (WebCore::startTextOrLineBreakBox):
+        (WebCore::endTextOrLineBreakBox):
+        (WebCore::logicallyPreviousBox):
+        (WebCore::logicallyNextBox):
+        (WebCore::startPositionForLine):
+        (WebCore::endPositionForLine):
+        (WebCore::absoluteLineDirectionPointToLocalPointInBlock):
+        (WebCore::previousLinePosition):
+        (WebCore::nextLinePosition):
+        * html/HTMLTextFormControlElement.cpp:
+        (WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks const):
+        * layout/integration/InlineIteratorBox.cpp:
+        (WebCore::InlineIterator::Box::lineBox const):
+        (WebCore::InlineIterator::Box::style const):
+        (WebCore::InlineIterator::Box::line const): Deleted.
+        * layout/integration/InlineIteratorBox.h:
+        * layout/integration/InlineIteratorLine.cpp:
+        (WebCore::InlineIterator::LineBoxIterator::LineBoxIterator):
+        (WebCore::InlineIterator::LineBoxIterator::atEnd const):
+        (WebCore::InlineIterator::LineBoxIterator::traverseNext):
+        (WebCore::InlineIterator::LineBoxIterator::traversePrevious):
+        (WebCore::InlineIterator::LineBoxIterator::operator== const):
+        (WebCore::InlineIterator::firstLineBoxFor):
+        (WebCore::InlineIterator::lastLineBoxFor):
+        (WebCore::InlineIterator::LineBox::next const):
+        (WebCore::InlineIterator::LineBox::previous const):
+        (WebCore::InlineIterator::LineBox::firstLeafBox const):
+        (WebCore::InlineIterator::LineBox::lastLeafBox const):
+        (WebCore::InlineIterator::closestBoxForHorizontalPosition):
+        (WebCore::InlineIterator::LineIterator::LineIterator): Deleted.
+        (WebCore::InlineIterator::LineIterator::atEnd const): Deleted.
+        (WebCore::InlineIterator::LineIterator::traverseNext): Deleted.
+        (WebCore::InlineIterator::LineIterator::traversePrevious): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator== const): Deleted.
+        (WebCore::InlineIterator::firstLineFor): Deleted.
+        (WebCore::InlineIterator::lastLineFor): Deleted.
+        (WebCore::InlineIterator::Line::next const): Deleted.
+        (WebCore::InlineIterator::Line::previous const): Deleted.
+        (WebCore::InlineIterator::Line::firstLeafBox const): Deleted.
+        (WebCore::InlineIterator::Line::lastLeafBox const): Deleted.
+        * layout/integration/InlineIteratorLine.h:
+        (WebCore::InlineIterator::LineBox::height const):
+        (WebCore::InlineIterator::LineBoxIterator::LineBoxIterator):
+        (WebCore::InlineIterator::LineBoxIterator::operator++):
+        (WebCore::InlineIterator::LineBoxIterator::operator!= const):
+        (WebCore::InlineIterator::LineBoxIterator::operator== const):
+        (WebCore::InlineIterator::LineBoxIterator::operator* const):
+        (WebCore::InlineIterator::LineBoxIterator::operator-> const):
+        (WebCore::InlineIterator::previousLineBoxContentBottomOrBorderAndPadding):
+        (WebCore::InlineIterator::contentStartInBlockDirection):
+        (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::top const):
+        (WebCore::InlineIterator::LineBox::bottom const):
+        (WebCore::InlineIterator::LineBox::contentLogicalLeft const):
+        (WebCore::InlineIterator::LineBox::contentLogicalRight const):
+        (WebCore::InlineIterator::LineBox::contentLogicalWidth const):
+        (WebCore::InlineIterator::LineBox::isHorizontal const):
+        (WebCore::InlineIterator::LineBox::baselineType const):
+        (WebCore::InlineIterator::LineBox::containingBlock const):
+        (WebCore::InlineIterator::LineBox::containingFragment const):
+        (WebCore::InlineIterator::LineBox::isFirstAfterPageBreak const):
+        (WebCore::InlineIterator::LineBox::isFirst const):
+        (WebCore::InlineIterator::Line::lineBoxHeight const): Deleted.
+        (WebCore::InlineIterator::LineIterator::LineIterator): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator++): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator bool const): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator!= const): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator== const): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator* const): Deleted.
+        (WebCore::InlineIterator::LineIterator::operator-> const): Deleted.
+        (WebCore::InlineIterator::previousLineContentBottomOrBorderAndPadding): Deleted.
+        (WebCore::InlineIterator::Line::Line): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalTop const): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalBottom const): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalTopAdjustedForPrecedingLine const): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalBottomAdjustedForFollowingLine const): Deleted.
+        (WebCore::InlineIterator::Line::lineBoxTop const): Deleted.
+        (WebCore::InlineIterator::Line::lineBoxBottom const): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalLeft const): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalRight const): Deleted.
+        (WebCore::InlineIterator::Line::contentLogicalWidth const): Deleted.
+        (WebCore::InlineIterator::Line::isHorizontal const): Deleted.
+        (WebCore::InlineIterator::Line::baselineType const): Deleted.
+        (WebCore::InlineIterator::Line::containingBlock const): Deleted.
+        (WebCore::InlineIterator::Line::containingFragment const): Deleted.
+        (WebCore::InlineIterator::Line::isFirstAfterPageBreak const): Deleted.
+        (WebCore::InlineIterator::Line::isFirst const): Deleted.
+        * layout/integration/InlineIteratorLineLegacyPath.h:
+        (WebCore::InlineIterator::LineBoxIteratorLegacyPath::LineBoxIteratorLegacyPath):
+        (WebCore::InlineIterator::LineBoxIteratorLegacyPath::contentLogicalTopAdjustedForPrecedingLineBox const):
+        (WebCore::InlineIterator::LineBoxIteratorLegacyPath::contentLogicalBottomAdjustedForFollowingLineBox const):
+        (WebCore::InlineIterator::LineBoxIteratorLegacyPath::top const):
+        (WebCore::InlineIterator::LineBoxIteratorLegacyPath::bottom const):
+        (WebCore::InlineIterator::LineBoxIteratorLegacyPath::operator== const):
+        (WebCore::InlineIterator::LineIteratorLegacyPath::LineIteratorLegacyPath): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalTop const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalBottom const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalTopAdjustedForPrecedingLine const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalBottomAdjustedForFollowingLine const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::lineBoxTop const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::lineBoxBottom const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalLeft const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::contentLogicalRight const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::isHorizontal const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::baselineType const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::containingBlock const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::containingFragment const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::isFirstAfterPageBreak const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::traverseNext): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::traversePrevious): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::operator== const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::atEnd const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::firstLeafBox const): Deleted.
+        (WebCore::InlineIterator::LineIteratorLegacyPath::lastLeafBox const): Deleted.
+        * layout/integration/InlineIteratorLineModernPath.h:
+        (WebCore::InlineIterator::LineBoxIteratorModernPath::LineBoxIteratorModernPath):
+        (WebCore::InlineIterator::LineBoxIteratorModernPath::top const):
+        (WebCore::InlineIterator::LineBoxIteratorModernPath::bottom const):
+        (WebCore::InlineIterator::LineBoxIteratorModernPath::contentLogicalTopAdjustedForPrecedingLineBox const):
+        (WebCore::InlineIterator::LineBoxIteratorModernPath::contentLogicalBottomAdjustedForFollowingLineBox const):
+        (WebCore::InlineIterator::LineBoxIteratorModernPath::operator== const):
+        (WebCore::InlineIterator::LineIteratorModernPath::LineIteratorModernPath): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::contentLogicalTop const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::contentLogicalBottom const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::lineBoxTop const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::lineBoxBottom const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::contentLogicalTopAdjustedForPrecedingLine const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::contentLogicalBottomAdjustedForFollowingLine const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::contentLogicalLeft const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::contentLogicalRight const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::isHorizontal const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::baselineType const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::containingBlock const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::containingFragment const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::isFirstAfterPageBreak const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::traverseNext): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::traversePrevious): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::operator== const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::atEnd const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::firstLeafBox const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::lastLeafBox const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::setAtEnd): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::lines const): Deleted.
+        (WebCore::InlineIterator::LineIteratorModernPath::line const): Deleted.
+        * layout/integration/InlineIteratorLogicalOrderTraversal.cpp:
+        (WebCore::InlineIterator::makeLineLogicalOrderCache):
+        (WebCore::InlineIterator::updateLineLogicalOrderCacheIfNeeded):
+        (WebCore::InlineIterator::firstLeafOnLineInLogicalOrder):
+        (WebCore::InlineIterator::lastLeafOnLineInLogicalOrder):
+        (WebCore::InlineIterator::firstLeafOnLineInLogicalOrderWithNode):
+        (WebCore::InlineIterator::lastLeafOnLineInLogicalOrderWithNode):
+        * layout/integration/InlineIteratorLogicalOrderTraversal.h:
+        (WebCore::InlineIterator::leafBoxesInLogicalOrder):
+        * layout/integration/InlineIteratorTextBox.cpp:
+        (WebCore::InlineIterator::TextBox::selectionRect const):
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::firstLineBox const):
+        (WebCore::LayoutIntegration::LineLayout::lastLineBox const):
+        (WebCore::LayoutIntegration::LineLayout::firstLine const): Deleted.
+        (WebCore::LayoutIntegration::LineLayout::lastLine const): Deleted.
+        * layout/integration/LayoutIntegrationLineLayout.h:
+        * layout/integration/LineSelection.h:
+        (WebCore::LineSelection::logicalTop):
+        (WebCore::LineSelection::logicalBottom):
+        (WebCore::LineSelection::logicalRect):
+        (WebCore::LineSelection::physicalRect):
+        (WebCore::LineSelection::logicalTopAdjustedForPrecedingBlock):
+        (WebCore::LineSelection::selectionState):
+        * rendering/CaretRectComputation.cpp:
+        (WebCore::computeCaretRectForLinePosition):
+        (WebCore::computeCaretRectForText):
+        (WebCore::computeCaretRectForLineBreak):
+        (WebCore::computeCaretRectForBox):
+        * rendering/InlineBoxPainter.cpp:
+        (WebCore::InlineBoxPainter::InlineBoxPainter):
+        (WebCore::InlineBoxPainter::paintMask):
+        (WebCore::InlineBoxPainter::paintDecorations):
+        (WebCore::InlineBoxPainter::style const):
+        * rendering/InlineBoxPainter.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::adjustEnclosingTopForPrecedingBlock const):
+        (WebCore::RenderBlockFlow::inlineSelectionGaps):
+        (WebCore::RenderBlockFlow::containsNonZeroBidiLevel const):
+        (WebCore::RenderBlockFlow::findClosestTextAtAbsolutePoint):
+        (WebCore::RenderBlockFlow::positionForPointWithInlineChildren):
+        (WebCore::RenderBlockFlow::addFocusRingRectsForInlineChildren):
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::getLeadingCorner const):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::paintOutline):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::positionForPoint):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::positionForPoint):
+        * rendering/TextBoxPainter.cpp:
+        (WebCore::TextBoxPainter::TextBoxPainter):
+        (WebCore::TextBoxPainter::paintBackground):
+        (WebCore::textPosition):
+        (WebCore::TextBoxPainter::computePaintRect):
+        * rendering/svg/SVGRootInlineBox.cpp:
+        (WebCore::SVGRootInlineBox::reorderValueListsToLogicalOrder):
+        * style/InlineTextBoxStyle.cpp:
+        (WebCore::minLogicalTopForTextDecorationLine):
+        (WebCore::maxLogicalBottomForTextDecorationLine):
+        (WebCore::computeUnderlineOffset):
+
 2022-03-20  Oriol Brufau  <obrufau@igalia.com>
 

trunk/Source/WebCore/Headers.cmake

@@ -977 +977 @@
     layout/integration/InlineIteratorBoxLegacyPath.h
     layout/integration/InlineIteratorBoxModernPath.h
-    layout/integration/InlineIteratorLine.h
-    layout/integration/InlineIteratorLineLegacyPath.h
-    layout/integration/InlineIteratorLineModernPath.h
+    layout/integration/InlineIteratorLineBox.h
+    layout/integration/InlineIteratorLineBoxLegacyPath.h
+    layout/integration/InlineIteratorLineBoxModernPath.h
     layout/integration/InlineIteratorLogicalOrderTraversal.h
     layout/integration/InlineIteratorTextBox.h

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5431 +5431 @@
                 E4C91A16180999F100A17F6D /* RenderTextLineBoxes.h in Headers */ = {isa = PBXBuildFile; fileRef = E4C91A15180999F100A17F6D /* RenderTextLineBoxes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E4D33F3B252AEECD00837D05 /* InlineRunAndOffset.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F39252AEECC00837D05 /* InlineRunAndOffset.h */; };
-                E4D33F41252C4B8300837D05 /* InlineIteratorLine.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F3F252C4B8200837D05 /* InlineIteratorLine.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                E4D33F44252C50E200837D05 /* InlineIteratorLineLegacyPath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F43252C50E200837D05 /* InlineIteratorLineLegacyPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                E4D33F46252C50FC00837D05 /* InlineIteratorLineModernPath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F45252C50FB00837D05 /* InlineIteratorLineModernPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E4D33F41252C4B8300837D05 /* InlineIteratorLineBox.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F3F252C4B8200837D05 /* InlineIteratorLineBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E4D33F44252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F43252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E4D33F46252C50FC00837D05 /* InlineIteratorLineBoxModernPath.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D33F45252C50FB00837D05 /* InlineIteratorLineBoxModernPath.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E4D58EB517B4DBDC00CBDCA8 /* StyleResolveForDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D58EB317B4DBDC00CBDCA8 /* StyleResolveForDocument.h */; };
                 E4D58EB917B4ED8900CBDCA8 /* StyleFontSizeFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D58EB717B4ED8900CBDCA8 /* StyleFontSizeFunctions.h */; };
@@ -17614 +17614 @@
                 E4C91A17180999FB00A17F6D /* RenderTextLineBoxes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextLineBoxes.cpp; sourceTree = "<group>"; };
                 E4D33F39252AEECC00837D05 /* InlineRunAndOffset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineRunAndOffset.h; sourceTree = "<group>"; };
-                E4D33F3F252C4B8200837D05 /* InlineIteratorLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLine.h; sourceTree = "<group>"; };
+                E4D33F3F252C4B8200837D05 /* InlineIteratorLineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineBox.h; sourceTree = "<group>"; };
                 E4D33F42252C50A800837D05 /* InlineIteratorLine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InlineIteratorLine.cpp; sourceTree = "<group>"; };
-                E4D33F43252C50E200837D05 /* InlineIteratorLineLegacyPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineLegacyPath.h; sourceTree = "<group>"; };
-                E4D33F45252C50FB00837D05 /* InlineIteratorLineModernPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineModernPath.h; sourceTree = "<group>"; };
+                E4D33F43252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineBoxLegacyPath.h; sourceTree = "<group>"; };
+                E4D33F45252C50FB00837D05 /* InlineIteratorLineBoxModernPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineIteratorLineBoxModernPath.h; sourceTree = "<group>"; };
                 E4D58EB217B4DBDC00CBDCA8 /* StyleResolveForDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleResolveForDocument.cpp; sourceTree = "<group>"; };
                 E4D58EB317B4DBDC00CBDCA8 /* StyleResolveForDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleResolveForDocument.h; sourceTree = "<group>"; };
@@ -31527 +31527 @@
                                 E415EB11270C351200E8DA1B /* InlineIteratorInlineBox.h */,
                                 E4D33F42252C50A800837D05 /* InlineIteratorLine.cpp */,
-                                E4D33F3F252C4B8200837D05 /* InlineIteratorLine.h */,
-                                E4D33F43252C50E200837D05 /* InlineIteratorLineLegacyPath.h */,
-                                E4D33F45252C50FB00837D05 /* InlineIteratorLineModernPath.h */,
+                                E4D33F3F252C4B8200837D05 /* InlineIteratorLineBox.h */,
+                                E4D33F43252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h */,
+                                E4D33F45252C50FB00837D05 /* InlineIteratorLineBoxModernPath.h */,
                                 E41ACC12271733F3003E9157 /* InlineIteratorLogicalOrderTraversal.cpp */,
                                 E41ACC1527173402003E9157 /* InlineIteratorLogicalOrderTraversal.h */,
@@ -35123 +35123 @@
                                 E4A664CE2521D4C9007081DC /* InlineIteratorBoxModernPath.h in Headers */,
                                 E415EB13270C351300E8DA1B /* InlineIteratorInlineBox.h in Headers */,
-                                E4D33F41252C4B8300837D05 /* InlineIteratorLine.h in Headers */,
-                                E4D33F44252C50E200837D05 /* InlineIteratorLineLegacyPath.h in Headers */,
-                                E4D33F46252C50FC00837D05 /* InlineIteratorLineModernPath.h in Headers */,
+                                E4D33F41252C4B8300837D05 /* InlineIteratorLineBox.h in Headers */,
+                                E4D33F44252C50E200837D05 /* InlineIteratorLineBoxLegacyPath.h in Headers */,
+                                E4D33F46252C50FC00837D05 /* InlineIteratorLineBoxModernPath.h in Headers */,
                                 E41ACC1627173402003E9157 /* InlineIteratorLogicalOrderTraversal.h in Headers */,
                                 E47CEBE12709916D00B8D8F5 /* InlineIteratorTextBox.h in Headers */,

trunk/Source/WebCore/dom/Position.cpp

@@ -37 +37 @@
 #include "HTMLParserIdioms.h"
 #include "HTMLTableElement.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorLogicalOrderTraversal.h"
 #include "InlineIteratorTextBox.h"
@@ -761 +761 @@
 
                 auto nextBox = InlineIterator::nextTextBoxInLogicalOrder(box, orderCache);
-                if (textOffset == box->end() + 1 && nextBox && box->line() != nextBox->line())
+                if (textOffset == box->end() + 1 && nextBox && box->lineBox() != nextBox->lineBox())
                     return currentPosition;
 
@@ -867 +867 @@
 
                 auto nextBox = InlineIterator::nextTextBoxInLogicalOrder(box, orderCache);
-                if (textOffset == box->end() && nextBox && box->line() != nextBox->line())
+                if (textOffset == box->end() && nextBox && box->lineBox() != nextBox->lineBox())
                     return currentPosition;
 
@@ -1096 +1096 @@
         return false;
 
-    if (box1->line() != box2->line())
+    if (box1->lineBox() != box2->lineBox())
         return true;
 

trunk/Source/WebCore/editing/RenderedPosition.h

@@ -33 +33 @@
 #include "CaretRectComputation.h"
 #include "InlineIteratorBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "TextAffinity.h"
 
@@ -51 +51 @@
 
     bool isNull() const { return !m_renderer; }
-    InlineIterator::LineIterator line() const { return m_box ? m_box->line() : InlineIterator::LineIterator(); }
+    InlineIterator::LineBoxIterator lineBox() const { return m_box ? m_box->lineBox() : InlineIterator::LineBoxIterator(); }
 
     unsigned char bidiLevelOnLeft() const;

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -37 +37 @@
 #include "HTMLNames.h"
 #include "InlineIteratorBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineRunAndOffset.h"
 #include "LineSelection.h"
@@ -161 +161 @@
                     Position positionOnLeft = primaryDirection == TextDirection::LTR ? previousVisuallyDistinctCandidate(m_deepPosition) : nextVisuallyDistinctCandidate(m_deepPosition);
                     auto boxOnLeft = positionOnLeft.inlineBoxAndOffset(m_affinity, primaryDirection).box;
-                    if (boxOnLeft && boxOnLeft->line() == box->line())
+                    if (boxOnLeft && boxOnLeft->lineBox() == box->lineBox())
                         return Position();
                     return positionOnLeft;
@@ -179 +179 @@
                 if (!previousBox) {
                     auto logicalStart = primaryDirection == TextDirection::LTR
-                        ? InlineIterator::firstLeafOnLineInLogicalOrderWithNode(box->line(), orderCache)
-                        : InlineIterator::lastLeafOnLineInLogicalOrderWithNode(box->line(), orderCache);
+                        ? InlineIterator::firstLeafOnLineInLogicalOrderWithNode(box->lineBox(), orderCache)
+                        : InlineIterator::lastLeafOnLineInLogicalOrderWithNode(box->lineBox(), orderCache);
                     if (logicalStart) {
                         box = logicalStart;
@@ -327 +327 @@
                     Position positionOnRight = primaryDirection == TextDirection::LTR ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);
                     auto boxOnRight = positionOnRight.inlineBoxAndOffset(m_affinity, primaryDirection).box;
-                    if (boxOnRight && boxOnRight->line() == box->line())
+                    if (boxOnRight && boxOnRight->lineBox() == box->lineBox())
                         return Position();
                     return positionOnRight;
@@ -345 +345 @@
                 if (!nextBox) {
                     auto logicalEnd = primaryDirection == TextDirection::LTR
-                        ? InlineIterator::lastLeafOnLineInLogicalOrderWithNode(box->line(), orderCache)
-                        : InlineIterator::firstLeafOnLineInLogicalOrderWithNode(box->line(), orderCache);
+                        ? InlineIterator::lastLeafOnLineInLogicalOrderWithNode(box->lineBox(), orderCache)
+                        : InlineIterator::firstLeafOnLineInLogicalOrderWithNode(box->lineBox(), orderCache);
 
                     if (logicalEnd) {
@@ -670 +670 @@
         return { };
 
-    auto line = box->line();
+    auto line = box->lineBox();
     return line->containingBlock().localToAbsoluteQuad(FloatRect { LineSelection::physicalRect(*line) }).boundingBox();
 }

trunk/Source/WebCore/editing/VisibleUnits.cpp

@@ -33 +33 @@
 #include "HTMLNames.h"
 #include "InlineIteratorBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorLogicalOrderTraversal.h"
 #include "InlineRunAndOffset.h"
@@ -151 +151 @@
 }
 
-static InlineIterator::LeafBoxIterator startTextOrLineBreakBox(InlineIterator::LineIterator line, InlineIterator::LineLogicalOrderCache& orderCache)
-{
-    auto box = InlineIterator::firstLeafOnLineInLogicalOrder(line, orderCache);
+static InlineIterator::LeafBoxIterator startTextOrLineBreakBox(InlineIterator::LineBoxIterator lineBox, InlineIterator::LineLogicalOrderCache& orderCache)
+{
+    auto box = InlineIterator::firstLeafOnLineInLogicalOrder(lineBox, orderCache);
     if (isTextOrLineBreakBox(box))
         return box;
@@ -159 +159 @@
 }
 
-static InlineIterator::LeafBoxIterator endTextOrLineBreakBox(InlineIterator::LineIterator line, InlineIterator::LineLogicalOrderCache& orderCache)
-{
-    auto box = InlineIterator::lastLeafOnLineInLogicalOrder(line, orderCache);
+static InlineIterator::LeafBoxIterator endTextOrLineBreakBox(InlineIterator::LineBoxIterator lineBox, InlineIterator::LineLogicalOrderCache& orderCache)
+{
+    auto box = InlineIterator::lastLeafOnLineInLogicalOrder(lineBox, orderCache);
     if (isTextOrLineBreakBox(box))
         return box;
@@ -172 +172 @@
         return previousBox;
 
-    if (auto previousLine = startBox->line()->previous()) {
+    if (auto previousLineBox = startBox->lineBox()->previous()) {
         // FIXME: Why isn't previousBoxInDifferentLine set here?
-        if (auto previousBox = endTextOrLineBreakBox(previousLine, orderCache))
+        if (auto previousBox = endTextOrLineBreakBox(previousLineBox, orderCache))
             return previousBox;
     }
@@ -188 +188 @@
 
         RenderedPosition renderedPosition(position, Affinity::Downstream);
-        auto previousLine = renderedPosition.line();
-        if (!previousLine)
-            break;
-
-        if (previousLine != startBox->line()) {
-            if (auto previousBox = endTextOrLineBreakBox(previousLine, orderCache)) {
+        auto previousLineBox = renderedPosition.lineBox();
+        if (!previousLineBox)
+            break;
+
+        if (previousLineBox != startBox->lineBox()) {
+            if (auto previousBox = endTextOrLineBreakBox(previousLineBox, orderCache)) {
                 previousBoxInDifferentLine = true;
                 return previousBox;
@@ -199 +199 @@
         }
 
-        startBox = InlineIterator::firstLeafOnLineInLogicalOrder(previousLine, orderCache);
+        startBox = InlineIterator::firstLeafOnLineInLogicalOrder(previousLineBox, orderCache);
     }
     return { };
@@ -210 +210 @@
         return nextBox;
 
-    if (auto nextLine = startBox->line()->next()) {
+    if (auto nextLineBox = startBox->lineBox()->next()) {
         // FIXME: Why isn't previousBoxInDifferentLine set here?
-        if (auto nextBox = startTextOrLineBreakBox(nextLine, orderCache))
+        if (auto nextBox = startTextOrLineBreakBox(nextLineBox, orderCache))
             return nextBox;
     }
@@ -226 +226 @@
 
         RenderedPosition renderedPosition(position, Affinity::Downstream);
-        auto nextLine = renderedPosition.line();
-        if (!nextLine)
-            break;
-
-        if (nextLine != startBox->line()) {
-            if (auto nextBox = startTextOrLineBreakBox(nextLine, orderCache)) {
+        auto nextLineBox = renderedPosition.lineBox();
+        if (!nextLineBox)
+            break;
+
+        if (nextLineBox != startBox->lineBox()) {
+            if (auto nextBox = startTextOrLineBreakBox(nextLineBox, orderCache)) {
                 nextBoxInDifferentLine = true;
                 return nextBox;
@@ -237 +237 @@
         }
 
-        startBox = InlineIterator::lastLeafOnLineInLogicalOrderWithNode(nextLine, orderCache);
+        startBox = InlineIterator::lastLeafOnLineInLogicalOrderWithNode(nextLineBox, orderCache);
     }
     return { };
@@ -739 +739 @@
         return VisiblePosition();
 
-    auto line = RenderedPosition(c).line();
-    if (!line) {
+    auto lineBox = RenderedPosition(c).lineBox();
+    if (!lineBox) {
         // There are VisiblePositions at offset 0 in blocks without
         // RootInlineBoxes, like empty editable blocks and bordered blocks.
@@ -753 +753 @@
 
     Node* startNode = nullptr;
-    auto startBox = mode == UseLogicalOrdering ? InlineIterator::firstLeafOnLineInLogicalOrderWithNode(line, orderCache) : line->firstLeafBox();
+    auto startBox = mode == UseLogicalOrdering ? InlineIterator::firstLeafOnLineInLogicalOrderWithNode(lineBox, orderCache) : lineBox->firstLeafBox();
     // Generated content (e.g. list markers and CSS :before and :after pseudoelements) have no corresponding DOM element,
     // and so cannot be represented by a VisiblePosition. Use whatever follows instead.
@@ -812 +812 @@
         return VisiblePosition();
 
-    auto line = RenderedPosition(c).line();
-    if (!line) {
+    auto lineBox = RenderedPosition(c).lineBox();
+    if (!lineBox) {
         // There are VisiblePositions at offset 0 in blocks without
         // RootInlineBoxes, like empty editable blocks and bordered blocks.
@@ -825 +825 @@
 
     Node* endNode = nullptr;
-    auto endBox = mode == UseLogicalOrdering ? InlineIterator::lastLeafOnLineInLogicalOrder(line, orderCache) : line->lastLeafBox();
+    auto endBox = mode == UseLogicalOrdering ? InlineIterator::lastLeafOnLineInLogicalOrder(lineBox, orderCache) : lineBox->lastLeafBox();
     // Generated content (e.g. list markers and CSS :before and :after pseudoelements) have no corresponding DOM element,
     // and so cannot be represented by a VisiblePosition. Use whatever precedes instead.
@@ -937 +937 @@
 }
 
-static inline IntPoint absoluteLineDirectionPointToLocalPointInBlock(InlineIterator::LineIterator& line, int lineDirectionPoint)
-{
-    auto& containingBlock = line->containingBlock();
+static inline IntPoint absoluteLineDirectionPointToLocalPointInBlock(InlineIterator::LineBoxIterator& lineBox, int lineDirectionPoint)
+{
+    auto& containingBlock = lineBox->containingBlock();
     FloatPoint absoluteBlockPoint = containingBlock.localToAbsolute(FloatPoint()) - toFloatSize(containingBlock.scrollPosition());
 
     if (containingBlock.isHorizontalWritingMode())
-        return IntPoint(lineDirectionPoint - absoluteBlockPoint.x(), contentStartInBlockDirection(*line));
-
-    return IntPoint(contentStartInBlockDirection(*line), lineDirectionPoint - absoluteBlockPoint.y());
+        return IntPoint(lineDirectionPoint - absoluteBlockPoint.x(), contentStartInBlockDirection(*lineBox));
+
+    return IntPoint(contentStartInBlockDirection(*lineBox), lineDirectionPoint - absoluteBlockPoint.y());
 }
 
@@ -969 +969 @@
         return VisiblePosition();
 
-    InlineIterator::LineIterator line;
+    InlineIterator::LineBoxIterator lineBox;
     if (auto box = visiblePosition.inlineBoxAndOffset().box) {
-        line = box->line()->previous();
+        lineBox = box->lineBox()->previous();
         // We want to skip zero height boxes.
         // This could happen in case it is a LegacyRootInlineBox with trailing floats.
-        if (!line || !line->lineBoxHeight() || !line->firstLeafBox())
-            line = { };
-    }
-
-    if (!line) {
+        if (!lineBox || !lineBox->height() || !lineBox->firstLeafBox())
+            lineBox = { };
+    }
+
+    if (!lineBox) {
         Position position = previousLineCandidatePosition(node, visiblePosition, editableType);
         if (position.isNotNull()) {
             RenderedPosition renderedPosition(position);
-            line = renderedPosition.line();
-            if (!line)
+            lineBox = renderedPosition.lineBox();
+            if (!lineBox)
                 return position;
         }
     }
     
-    if (line) {
+    if (lineBox) {
         // FIXME: Can be wrong for multi-column layout and with transforms.
-        auto pointInLine = absoluteLineDirectionPointToLocalPointInBlock(line, lineDirectionPoint);
-        auto box = closestBoxForHorizontalPosition(*line, line->isHorizontal() ? pointInLine.x() : pointInLine.y(), isEditablePosition(p));
+        auto pointInLine = absoluteLineDirectionPointToLocalPointInBlock(lineBox, lineDirectionPoint);
+        auto box = closestBoxForHorizontalPosition(*lineBox, lineBox->isHorizontal() ? pointInLine.x() : pointInLine.y(), isEditablePosition(p));
         if (!box)
             return VisiblePosition();
@@ -1022 +1022 @@
         return VisiblePosition();
 
-    InlineIterator::LineIterator line;
+    InlineIterator::LineBoxIterator lineBox;
     if (auto box = visiblePosition.inlineBoxAndOffset().box) {
-        line = box->line()->next();
+        lineBox = box->lineBox()->next();
         // We want to skip zero height boxes.
         // This could happen in case it is a LegacyRootInlineBox with trailing floats.
-        if (!line || !line->lineBoxHeight() || !line->firstLeafBox())
-            line = { };
-    }
-
-    if (!line) {
+        if (!lineBox || !lineBox->height() || !lineBox->firstLeafBox())
+            lineBox = { };
+    }
+
+    if (!lineBox) {
         // FIXME: We need do the same in previousLinePosition.
         Node* child = node->traverseToChildAt(p.deprecatedEditingOffset());
@@ -1038 +1038 @@
         if (position.isNotNull()) {
             RenderedPosition renderedPosition(position);
-            line = renderedPosition.line();
-            if (!line)
+            lineBox = renderedPosition.lineBox();
+            if (!lineBox)
                 return position;
         }
     }
     
-    if (line) {
+    if (lineBox) {
         // FIXME: Can be wrong for multi-column layout and with transforms.
-        auto pointInLine = absoluteLineDirectionPointToLocalPointInBlock(line, lineDirectionPoint);
-        auto box = closestBoxForHorizontalPosition(*line, line->isHorizontal() ? pointInLine.x() : pointInLine.y(), isEditablePosition(p));
+        auto pointInLine = absoluteLineDirectionPointToLocalPointInBlock(lineBox, lineDirectionPoint);
+        auto box = closestBoxForHorizontalPosition(*lineBox, lineBox->isHorizontal() ? pointInLine.x() : pointInLine.y(), isEditablePosition(p));
         if (!box)
             return VisiblePosition();

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -43 +43 @@
 #include "HTMLParserIdioms.h"
 #include "InlineIteratorBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LayoutDisallowedScope.h"
 #include "Logging.h"
@@ -728 +728 @@
     Node* softLineBreakNode = nullptr;
     unsigned softLineBreakOffset = 0;
-    auto currentLine = InlineIterator::firstLineFor(*renderer);
-    if (!currentLine)
+    auto currentLineBox = InlineIterator::firstLineBoxFor(*renderer);
+    if (!currentLineBox)
         return value();
 
     auto skipToNextSoftLineBreakPosition = [&] {
-        for (; currentLine; currentLine.traverseNext()) {
-            auto lastRun = currentLine->lastLeafBox();
+        for (; currentLineBox; currentLineBox.traverseNext()) {
+            auto lastRun = currentLineBox->lastLeafBox();
             ASSERT(lastRun);
             auto& renderer = lastRun->renderer();
@@ -741 +741 @@
                 softLineBreakNode = renderer.node();
                 softLineBreakOffset = lastRun->maximumCaretOffset();
-                currentLine.traverseNext();
+                currentLineBox.traverseNext();
                 return;
             }

trunk/Source/WebCore/layout/integration/InlineIteratorBox.cpp

@@ -27 +27 @@
 #include "InlineIteratorBox.h"
 
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorTextBox.h"
 #include "LayoutIntegrationLineLayout.h"
@@ -82 +82 @@
 }
 
-LineIterator Box::line() const
+LineBoxIterator Box::lineBox() const
 {
     return WTF::switchOn(m_pathVariant, [](const BoxLegacyPath& path) {
-        return LineIterator(LineIteratorLegacyPath(&path.rootInlineBox()));
+        return LineBoxIterator(LineBoxIteratorLegacyPath(&path.rootInlineBox()));
     }
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     , [](const BoxModernPath& path) {
-        return LineIterator(LineIteratorModernPath(path.inlineContent(), path.box().lineIndex()));
+        return LineBoxIterator(LineBoxIteratorModernPath(path.inlineContent(), path.box().lineIndex()));
     }
 #endif
@@ -97 +97 @@
 const RenderStyle& Box::style() const
 {
-    return line()->isFirst() ? renderer().firstLineStyle() : renderer().style();
+    return lineBox()->isFirst() ? renderer().firstLineStyle() : renderer().style();
 }
 

trunk/Source/WebCore/layout/integration/InlineIteratorBox.h

@@ -39 +39 @@
 namespace InlineIterator {
 
-class LineIterator;
+class LineBoxIterator;
 class BoxIterator;
 class LeafBoxIterator;
@@ -99 +99 @@
     LeafBoxIterator previousOnLineIgnoringLineBreak() const;
 
-    LineIterator line() const;
+    LineBoxIterator lineBox() const;
 
 protected:

trunk/Source/WebCore/layout/integration/InlineIteratorLine.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 
 #include "InlineIteratorBox.h"
@@ -34 +34 @@
 namespace InlineIterator {
 
-LineIterator::LineIterator(Line::PathVariant&& pathVariant)
-    : m_line(WTFMove(pathVariant))
+LineBoxIterator::LineBoxIterator(LineBox::PathVariant&& pathVariant)
+    : m_lineBox(WTFMove(pathVariant))
 {
 }
 
-LineIterator::LineIterator(const Line& line)
-    : m_line(line)
+LineBoxIterator::LineBoxIterator(const LineBox& lineBox)
+    : m_lineBox(lineBox)
 {
 }
 
-bool LineIterator::atEnd() const
+bool LineBoxIterator::atEnd() const
 {
-    return WTF::switchOn(m_line.m_pathVariant, [](auto& path) {
+    return WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
         return path.atEnd();
     });
 }
 
-LineIterator& LineIterator::traverseNext()
+LineBoxIterator& LineBoxIterator::traverseNext()
 {
-    WTF::switchOn(m_line.m_pathVariant, [](auto& path) {
+    WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
         return path.traverseNext();
     });
@@ -59 +59 @@
 }
 
-LineIterator& LineIterator::traversePrevious()
+LineBoxIterator& LineBoxIterator::traversePrevious()
 {
-    WTF::switchOn(m_line.m_pathVariant, [](auto& path) {
+    WTF::switchOn(m_lineBox.m_pathVariant, [](auto& path) {
         return path.traversePrevious();
     });
@@ -67 +67 @@
 }
 
-bool LineIterator::operator==(const LineIterator& other) const
+bool LineBoxIterator::operator==(const LineBoxIterator& other) const
 {
-    return m_line.m_pathVariant == other.m_line.m_pathVariant;
+    return m_lineBox.m_pathVariant == other.m_lineBox.m_pathVariant;
 }
 
-LineIterator firstLineFor(const RenderBlockFlow& flow)
+LineBoxIterator firstLineBoxFor(const RenderBlockFlow& flow)
 {
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (auto* lineLayout = flow.modernLineLayout())
-        return lineLayout->firstLine();
+        return lineLayout->firstLineBox();
 #endif
 
-    return { LineIteratorLegacyPath { flow.firstRootBox() } };
+    return { LineBoxIteratorLegacyPath { flow.firstRootBox() } };
 }
 
-LineIterator lastLineFor(const RenderBlockFlow& flow)
+LineBoxIterator lastLineBoxFor(const RenderBlockFlow& flow)
 {
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     if (auto* lineLayout = flow.modernLineLayout())
-        return lineLayout->lastLine();
+        return lineLayout->lastLineBox();
 #endif
 
-    return { LineIteratorLegacyPath { flow.lastRootBox() } };
+    return { LineBoxIteratorLegacyPath { flow.lastRootBox() } };
 }
 
-LineIterator Line::next() const
+LineBoxIterator LineBox::next() const
 {
-    return LineIterator(*this).traverseNext();
+    return LineBoxIterator(*this).traverseNext();
 }
 
-LineIterator Line::previous() const
+LineBoxIterator LineBox::previous() const
 {
-    return LineIterator(*this).traversePrevious();
+    return LineBoxIterator(*this).traversePrevious();
 }
 
-LeafBoxIterator Line::firstLeafBox() const
+LeafBoxIterator LineBox::firstLeafBox() const
 {
     return WTF::switchOn(m_pathVariant, [](auto& path) -> LeafBoxIterator {
@@ -109 +109 @@
 }
 
-LeafBoxIterator Line::lastLeafBox() const
+LeafBoxIterator LineBox::lastLeafBox() const
 {
     return WTF::switchOn(m_pathVariant, [](auto& path) -> LeafBoxIterator {
@@ -116 +116 @@
 }
 
-LeafBoxIterator closestBoxForHorizontalPosition(const Line& line, float horizontalPosition, bool editableOnly)
+LeafBoxIterator closestBoxForHorizontalPosition(const LineBox& lineBox, float horizontalPosition, bool editableOnly)
 {
     auto isEditable = [&](auto box) {
@@ -122 +122 @@
     };
 
-    auto firstBox = line.firstLeafBox();
-    auto lastBox = line.lastLeafBox();
+    auto firstBox = lineBox.firstLeafBox();
+    auto lastBox = lineBox.lastLeafBox();
 
     if (firstBox != lastBox) {

trunk/Source/WebCore/layout/integration/InlineIteratorLineBox.h

@@ -27 +27 @@
 
 #include "FontBaseline.h"
-#include "InlineIteratorLineLegacyPath.h"
-#include "InlineIteratorLineModernPath.h"
+#include "InlineIteratorLineBoxLegacyPath.h"
+#include "InlineIteratorLineBoxModernPath.h"
 #include "RenderBlockFlow.h"
 #include <variant>
@@ -38 +38 @@
 namespace InlineIterator {
 
-class LineIterator;
+class LineBoxIterator;
 class PathIterator;
 class LeafBoxIterator;
 
-struct EndLineIterator { };
-
-class Line {
+struct EndLineBoxIterator { };
+
+class LineBox {
 public:
     using PathVariant = std::variant<
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-        LineIteratorModernPath,
+        LineBoxIteratorModernPath,
 #endif
-        LineIteratorLegacyPath
+        LineBoxIteratorLegacyPath
     >;
 
-    Line(PathVariant&&);
-
-    float lineBoxTop() const;
-    float lineBoxBottom() const;
-    float lineBoxHeight() const { return lineBoxBottom() - lineBoxTop(); }
+    LineBox(PathVariant&&);
+
+    float top() const;
+    float bottom() const;
+    float height() const { return bottom() - top(); }
 
     float contentLogicalTop() const;
@@ -65 +65 @@
     float contentLogicalWidth() const;
 
-    float contentLogicalTopAdjustedForPrecedingLine() const;
-    float contentLogicalBottomAdjustedForFollowingLine() const;
+    float contentLogicalTopAdjustedForPrecedingLineBox() const;
+    float contentLogicalBottomAdjustedForFollowingLineBox() const;
 
     const RenderBlockFlow& containingBlock() const;
@@ -80 +80 @@
     LeafBoxIterator lastLeafBox() const;
 
-    LineIterator next() const;
-    LineIterator previous() const;
+    LineBoxIterator next() const;
+    LineBoxIterator previous() const;
 
 private:
-    friend class LineIterator;
+    friend class LineBoxIterator;
 
     PathVariant m_pathVariant;
 };
 
-class LineIterator {
+class LineBoxIterator {
 public:
-    LineIterator() : m_line(LineIteratorLegacyPath { nullptr }) { };
-    LineIterator(const LegacyRootInlineBox* rootInlineBox) : m_line(LineIteratorLegacyPath { rootInlineBox }) { };
-    LineIterator(Line::PathVariant&&);
-    LineIterator(const Line&);
-
-    LineIterator& operator++() { return traverseNext(); }
-    LineIterator& traverseNext();
-    LineIterator& traversePrevious();
+    LineBoxIterator() : m_lineBox(LineBoxIteratorLegacyPath { nullptr }) { };
+    LineBoxIterator(const LegacyRootInlineBox* rootInlineBox) : m_lineBox(LineBoxIteratorLegacyPath { rootInlineBox }) { };
+    LineBoxIterator(LineBox::PathVariant&&);
+    LineBoxIterator(const LineBox&);
+
+    LineBoxIterator& operator++() { return traverseNext(); }
+    LineBoxIterator& traverseNext();
+    LineBoxIterator& traversePrevious();
 
     explicit operator bool() const { return !atEnd(); }
 
-    bool operator==(const LineIterator&) const;
-    bool operator!=(const LineIterator& other) const { return !(*this == other); }
-
-    bool operator==(EndLineIterator) const { return atEnd(); }
-    bool operator!=(EndLineIterator) const { return !atEnd(); }
-
-    const Line& operator*() const { return m_line; }
-    const Line* operator->() const { return &m_line; }
+    bool operator==(const LineBoxIterator&) const;
+    bool operator!=(const LineBoxIterator& other) const { return !(*this == other); }
+
+    bool operator==(EndLineBoxIterator) const { return atEnd(); }
+    bool operator!=(EndLineBoxIterator) const { return !atEnd(); }
+
+    const LineBox& operator*() const { return m_lineBox; }
+    const LineBox* operator->() const { return &m_lineBox; }
 
     bool atEnd() const;
 
 private:
-    Line m_line;
+    LineBox m_lineBox;
 };
 
-LineIterator firstLineFor(const RenderBlockFlow&);
-LineIterator lastLineFor(const RenderBlockFlow&);
-LeafBoxIterator closestBoxForHorizontalPosition(const Line&, float horizontalPosition, bool editableOnly = false);
+LineBoxIterator firstLineBoxFor(const RenderBlockFlow&);
+LineBoxIterator lastLineBoxFor(const RenderBlockFlow&);
+LeafBoxIterator closestBoxForHorizontalPosition(const LineBox&, float horizontalPosition, bool editableOnly = false);
 
 // -----------------------------------------------
-inline float previousLineContentBottomOrBorderAndPadding(const Line& line)
-{
-    return line.isFirst() ? line.containingBlock().borderAndPaddingBefore().toFloat() : line.contentLogicalTopAdjustedForPrecedingLine(); 
-}
-
-inline float contentStartInBlockDirection(const Line& line)
-{
-    if (!line.containingBlock().style().isFlippedBlocksWritingMode())
-        return std::max(line.contentLogicalTop(), previousLineContentBottomOrBorderAndPadding(line));
-    return std::min(line.contentLogicalBottom(), line.contentLogicalBottomAdjustedForFollowingLine());
-}
-
-inline Line::Line(PathVariant&& path)
+inline float previousLineBoxContentBottomOrBorderAndPadding(const LineBox& lineBox)
+{
+    return lineBox.isFirst() ? lineBox.containingBlock().borderAndPaddingBefore().toFloat() : lineBox.contentLogicalTopAdjustedForPrecedingLineBox(); 
+}
+
+inline float contentStartInBlockDirection(const LineBox& lineBox)
+{
+    if (!lineBox.containingBlock().style().isFlippedBlocksWritingMode())
+        return std::max(lineBox.contentLogicalTop(), previousLineBoxContentBottomOrBorderAndPadding(lineBox));
+    return std::min(lineBox.contentLogicalBottom(), lineBox.contentLogicalBottomAdjustedForFollowingLineBox());
+}
+
+inline LineBox::LineBox(PathVariant&& path)
     : m_pathVariant(WTFMove(path))
 {
 }
 
-inline float Line::contentLogicalTop() const
+inline float LineBox::contentLogicalTop() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -146 +146 @@
 }
 
-inline float Line::contentLogicalBottom() const
+inline float LineBox::contentLogicalBottom() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -153 +153 @@
 }
 
-inline float Line::contentLogicalTopAdjustedForPrecedingLine() const
-{
-    return WTF::switchOn(m_pathVariant, [](const auto& path) {
-        return path.contentLogicalTopAdjustedForPrecedingLine();
-    });
-}
-
-inline float Line::contentLogicalBottomAdjustedForFollowingLine() const
-{
-    return WTF::switchOn(m_pathVariant, [](const auto& path) {
-        return path.contentLogicalBottomAdjustedForFollowingLine();
-    });
-}
-
-inline float Line::lineBoxTop() const
-{
-    return WTF::switchOn(m_pathVariant, [](const auto& path) {
-        return path.lineBoxTop();
-    });
-}
-
-inline float Line::lineBoxBottom() const
-{
-    return WTF::switchOn(m_pathVariant, [](const auto& path) {
-        return path.lineBoxBottom();
-    });
-}
-
-inline float Line::contentLogicalLeft() const
+inline float LineBox::contentLogicalTopAdjustedForPrecedingLineBox() const
+{
+    return WTF::switchOn(m_pathVariant, [](const auto& path) {
+        return path.contentLogicalTopAdjustedForPrecedingLineBox();
+    });
+}
+
+inline float LineBox::contentLogicalBottomAdjustedForFollowingLineBox() const
+{
+    return WTF::switchOn(m_pathVariant, [](const auto& path) {
+        return path.contentLogicalBottomAdjustedForFollowingLineBox();
+    });
+}
+
+inline float LineBox::top() const
+{
+    return WTF::switchOn(m_pathVariant, [](const auto& path) {
+        return path.top();
+    });
+}
+
+inline float LineBox::bottom() const
+{
+    return WTF::switchOn(m_pathVariant, [](const auto& path) {
+        return path.bottom();
+    });
+}
+
+inline float LineBox::contentLogicalLeft() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -188 +188 @@
 }
 
-inline float Line::contentLogicalRight() const
+inline float LineBox::contentLogicalRight() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -195 +195 @@
 }
 
-inline float Line::contentLogicalWidth() const
+inline float LineBox::contentLogicalWidth() const
 {
     return contentLogicalRight() - contentLogicalLeft();
 }
 
-inline bool Line::isHorizontal() const
+inline bool LineBox::isHorizontal() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -207 +207 @@
 }
 
-inline FontBaseline Line::baselineType() const
+inline FontBaseline LineBox::baselineType() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -214 +214 @@
 }
 
-inline const RenderBlockFlow& Line::containingBlock() const
+inline const RenderBlockFlow& LineBox::containingBlock() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) -> const RenderBlockFlow& {
@@ -221 +221 @@
 }
 
-inline RenderFragmentContainer* Line::containingFragment() const
+inline RenderFragmentContainer* LineBox::containingFragment() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -228 +228 @@
 }
 
-inline bool Line::isFirstAfterPageBreak() const
+inline bool LineBox::isFirstAfterPageBreak() const
 {
     return WTF::switchOn(m_pathVariant, [](const auto& path) {
@@ -235 +235 @@
 }
 
-inline bool Line::isFirst() const
+inline bool LineBox::isFirst() const
 {
     return !previous();

trunk/Source/WebCore/layout/integration/InlineIteratorLineBoxLegacyPath.h

@@ -33 +33 @@
 namespace InlineIterator {
 
-class LineIteratorLegacyPath {
+class LineBoxIteratorLegacyPath {
 public:
-    LineIteratorLegacyPath(const LegacyRootInlineBox* rootInlineBox)
+    LineBoxIteratorLegacyPath(const LegacyRootInlineBox* rootInlineBox)
         : m_rootInlineBox(rootInlineBox)
     {
     }
-    LineIteratorLegacyPath(LineIteratorLegacyPath&&) = default;
-    LineIteratorLegacyPath(const LineIteratorLegacyPath&) = default;
-    LineIteratorLegacyPath& operator=(const LineIteratorLegacyPath&) = default;
-    LineIteratorLegacyPath& operator=(LineIteratorLegacyPath&&) = default;
+    LineBoxIteratorLegacyPath(LineBoxIteratorLegacyPath&&) = default;
+    LineBoxIteratorLegacyPath(const LineBoxIteratorLegacyPath&) = default;
+    LineBoxIteratorLegacyPath& operator=(const LineBoxIteratorLegacyPath&) = default;
+    LineBoxIteratorLegacyPath& operator=(LineBoxIteratorLegacyPath&&) = default;
 
     float contentLogicalTop() const { return m_rootInlineBox->lineTop().toFloat(); }
     float contentLogicalBottom() const { return m_rootInlineBox->lineBottom().toFloat(); }
-    float contentLogicalTopAdjustedForPrecedingLine() const { return m_rootInlineBox->selectionTop().toFloat(); }
-    float contentLogicalBottomAdjustedForFollowingLine() const { return m_rootInlineBox->selectionBottom().toFloat(); }
-    float lineBoxTop() const { return m_rootInlineBox->lineBoxTop().toFloat(); }
-    float lineBoxBottom() const { return m_rootInlineBox->lineBoxBottom().toFloat(); }
+    float contentLogicalTopAdjustedForPrecedingLineBox() const { return m_rootInlineBox->selectionTop().toFloat(); }
+    float contentLogicalBottomAdjustedForFollowingLineBox() const { return m_rootInlineBox->selectionBottom().toFloat(); }
+    float top() const { return m_rootInlineBox->lineBoxTop().toFloat(); }
+    float bottom() const { return m_rootInlineBox->lineBoxBottom().toFloat(); }
 
     float contentLogicalLeft() const { return m_rootInlineBox->logicalLeft(); }
@@ -71 +71 @@
     }
 
-    bool operator==(const LineIteratorLegacyPath& other) const { return m_rootInlineBox == other.m_rootInlineBox; }
+    bool operator==(const LineBoxIteratorLegacyPath& other) const { return m_rootInlineBox == other.m_rootInlineBox; }
 
     bool atEnd() const { return !m_rootInlineBox; }

trunk/Source/WebCore/layout/integration/InlineIteratorLineBoxModernPath.h

@@ -37 +37 @@
 class BoxModernPath;
 
-class LineIteratorModernPath {
+class LineBoxIteratorModernPath {
 public:
-    LineIteratorModernPath(const LayoutIntegration::InlineContent& inlineContent, size_t lineIndex)
+    LineBoxIteratorModernPath(const LayoutIntegration::InlineContent& inlineContent, size_t lineIndex)
         : m_inlineContent(&inlineContent)
         , m_lineIndex(lineIndex)
@@ -45 +45 @@
         ASSERT(lineIndex <= lines().size());
     }
-    LineIteratorModernPath(LineIteratorModernPath&&) = default;
-    LineIteratorModernPath(const LineIteratorModernPath&) = default;
-    LineIteratorModernPath& operator=(const LineIteratorModernPath&) = default;
-    LineIteratorModernPath& operator=(LineIteratorModernPath&&) = default;
+    LineBoxIteratorModernPath(LineBoxIteratorModernPath&&) = default;
+    LineBoxIteratorModernPath(const LineBoxIteratorModernPath&) = default;
+    LineBoxIteratorModernPath& operator=(const LineBoxIteratorModernPath&) = default;
+    LineBoxIteratorModernPath& operator=(LineBoxIteratorModernPath&&) = default;
 
     float contentLogicalTop() const { return line().enclosingContentTop(); }
     float contentLogicalBottom() const { return line().enclosingContentBottom(); }
-    float lineBoxTop() const { return line().lineBoxTop(); }
-    float lineBoxBottom() const { return line().lineBoxBottom(); }
+    float top() const { return line().lineBoxTop(); }
+    float bottom() const { return line().lineBoxBottom(); }
 
-    float contentLogicalTopAdjustedForPrecedingLine() const { return !m_lineIndex ? contentLogicalTop() : LineIteratorModernPath(*m_inlineContent, m_lineIndex - 1).contentLogicalBottomAdjustedForFollowingLine(); }
+    float contentLogicalTopAdjustedForPrecedingLineBox() const { return !m_lineIndex ? contentLogicalTop() : LineBoxIteratorModernPath(*m_inlineContent, m_lineIndex - 1).contentLogicalBottomAdjustedForFollowingLineBox(); }
     // FIXME: Implement.
-    float contentLogicalBottomAdjustedForFollowingLine() const { return contentLogicalBottom(); }
+    float contentLogicalBottomAdjustedForFollowingLineBox() const { return contentLogicalBottom(); }
 
     float contentLogicalLeft() const { return line().lineBoxLeft() + line().contentLogicalOffset(); }
@@ -88 +88 @@
     }
 
-    bool operator==(const LineIteratorModernPath& other) const { return m_inlineContent == other.m_inlineContent && m_lineIndex == other.m_lineIndex; }
+    bool operator==(const LineBoxIteratorModernPath& other) const { return m_inlineContent == other.m_inlineContent && m_lineIndex == other.m_lineIndex; }
 
     bool atEnd() const { return m_lineIndex == lines().size(); }

trunk/Source/WebCore/layout/integration/InlineIteratorLogicalOrderTraversal.cpp

@@ -27 +27 @@
 #include "InlineIteratorLogicalOrderTraversal.h"
 
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 
 namespace WebCore {
@@ -90 +90 @@
 }
 
-static LineLogicalOrderCache makeLineLogicalOrderCache(const LineIterator& line)
+static LineLogicalOrderCache makeLineLogicalOrderCache(const LineBoxIterator& lineBox)
 {
     auto cache = makeUnique<LineLogicalOrderCacheData>();
 
-    cache->line = line;
-    cache->boxes = leafBoxesInLogicalOrder(line, [](auto first, auto last) {
+    cache->lineBox = lineBox;
+    cache->boxes = leafBoxesInLogicalOrder(lineBox, [](auto first, auto last) {
         std::reverse(first, last);
     });
@@ -104 +104 @@
 static void updateLineLogicalOrderCacheIfNeeded(const LeafBoxIterator& box, LineLogicalOrderCache& cache)
 {
-    auto line = box->line();
-    if (!cache || cache->line != line)
-        cache = makeLineLogicalOrderCache(line);
+    auto lineBox = box->lineBox();
+    if (!cache || cache->lineBox != lineBox)
+        cache = makeLineLogicalOrderCache(lineBox);
 
     if (cache->index < cache->boxes.size() && cache->boxes[cache->index] == box)
@@ -116 +116 @@
 }
 
-LeafBoxIterator firstLeafOnLineInLogicalOrder(const LineIterator& line, LineLogicalOrderCache& cache)
+LeafBoxIterator firstLeafOnLineInLogicalOrder(const LineBoxIterator& lineBox, LineLogicalOrderCache& cache)
 {
-    cache = makeLineLogicalOrderCache(line);
+    cache = makeLineLogicalOrderCache(lineBox);
 
     if (cache->boxes.isEmpty())
@@ -127 +127 @@
 }
 
-LeafBoxIterator lastLeafOnLineInLogicalOrder(const LineIterator& line, LineLogicalOrderCache& cache)
+LeafBoxIterator lastLeafOnLineInLogicalOrder(const LineBoxIterator& lineBox, LineLogicalOrderCache& cache)
 {
-    cache = makeLineLogicalOrderCache(line);
+    cache = makeLineLogicalOrderCache(lineBox);
 
     if (cache->boxes.isEmpty())
@@ -162 +162 @@
 }
 
-LeafBoxIterator firstLeafOnLineInLogicalOrderWithNode(const LineIterator& line, LineLogicalOrderCache& cache)
+LeafBoxIterator firstLeafOnLineInLogicalOrderWithNode(const LineBoxIterator& lineBox, LineLogicalOrderCache& cache)
 {
-    auto box = firstLeafOnLineInLogicalOrder(line, cache);
+    auto box = firstLeafOnLineInLogicalOrder(lineBox, cache);
     while (box && !box->renderer().node())
         box = nextLeafOnLineInLogicalOrder(box, cache);
@@ -170 +170 @@
 }
 
-LeafBoxIterator lastLeafOnLineInLogicalOrderWithNode(const LineIterator& line, LineLogicalOrderCache& cache)
+LeafBoxIterator lastLeafOnLineInLogicalOrderWithNode(const LineBoxIterator& lineBox, LineLogicalOrderCache& cache)
 {
-    auto box = lastLeafOnLineInLogicalOrder(line, cache);
+    auto box = lastLeafOnLineInLogicalOrder(lineBox, cache);
     while (box && !box->renderer().node())
         box = previousLeafOnLineInLogicalOrder(box, cache);

trunk/Source/WebCore/layout/integration/InlineIteratorLogicalOrderTraversal.h

@@ -26 +26 @@
 #pragma once
 
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorTextBox.h"
 #include "RenderBlockFlow.h"
@@ -47 +47 @@
     WTF_MAKE_STRUCT_FAST_ALLOCATED;
 
-    LineIterator line;
+    LineBoxIterator lineBox;
     Vector<LeafBoxIterator> boxes;
     size_t index { 0 };
@@ -53 +53 @@
 using LineLogicalOrderCache = std::unique_ptr<LineLogicalOrderCacheData>;
 
-LeafBoxIterator firstLeafOnLineInLogicalOrder(const LineIterator&, LineLogicalOrderCache&);
-LeafBoxIterator lastLeafOnLineInLogicalOrder(const LineIterator&, LineLogicalOrderCache&);
+LeafBoxIterator firstLeafOnLineInLogicalOrder(const LineBoxIterator&, LineLogicalOrderCache&);
+LeafBoxIterator lastLeafOnLineInLogicalOrder(const LineBoxIterator&, LineLogicalOrderCache&);
 LeafBoxIterator nextLeafOnLineInLogicalOrder(const LeafBoxIterator&, LineLogicalOrderCache&);
 LeafBoxIterator previousLeafOnLineInLogicalOrder(const LeafBoxIterator&, LineLogicalOrderCache&);
 
-LeafBoxIterator firstLeafOnLineInLogicalOrderWithNode(const LineIterator&, LineLogicalOrderCache&);
-LeafBoxIterator lastLeafOnLineInLogicalOrderWithNode(const LineIterator&, LineLogicalOrderCache&);
+LeafBoxIterator firstLeafOnLineInLogicalOrderWithNode(const LineBoxIterator&, LineLogicalOrderCache&);
+LeafBoxIterator lastLeafOnLineInLogicalOrderWithNode(const LineBoxIterator&, LineLogicalOrderCache&);
 
 template<typename ReverseFunction>
-Vector<LeafBoxIterator> leafBoxesInLogicalOrder(const LineIterator& line, ReverseFunction&& reverseFunction)
+Vector<LeafBoxIterator> leafBoxesInLogicalOrder(const LineBoxIterator& lineBox, ReverseFunction&& reverseFunction)
 {
     Vector<LeafBoxIterator> boxes;
@@ -69 +69 @@
     unsigned char maxLevel = 0;
 
-    for (auto box = line->firstLeafBox(); box; box = box.traverseNextOnLine()) {
+    for (auto box = lineBox->firstLeafBox(); box; box = box.traverseNextOnLine()) {
         minLevel = std::min(minLevel, box->bidiLevel());
         maxLevel = std::max(maxLevel, box->bidiLevel());
@@ -75 +75 @@
     }
 
-    if (line->containingBlock().style().rtlOrdering() == Order::Visual)
+    if (lineBox->containingBlock().style().rtlOrdering() == Order::Visual)
         return boxes;
 

trunk/Source/WebCore/layout/integration/InlineIteratorTextBox.cpp

@@ -27 +27 @@
 #include "InlineIteratorTextBox.h"
 
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LayoutIntegrationLineLayout.h"
 #include "LineSelection.h"
@@ -47 +47 @@
         return { };
 
-    auto lineSelectionRect = LineSelection::logicalRect(*line());
+    auto lineSelectionRect = LineSelection::logicalRect(*lineBox());
     auto selectionRect = LayoutRect { logicalLeft(), lineSelectionRect.y(), logicalWidth(), lineSelectionRect.height() };
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -621 +621 @@
 }
 
-InlineIterator::LineIterator LineLayout::firstLine() const
-{
-    if (!m_inlineContent)
-        return { };
-
-    return { InlineIterator::LineIteratorModernPath(*m_inlineContent, 0) };
-}
-
-InlineIterator::LineIterator LineLayout::lastLine() const
-{
-    if (!m_inlineContent)
-        return { };
-
-    return { InlineIterator::LineIteratorModernPath(*m_inlineContent, m_inlineContent->lines.isEmpty() ? 0 : m_inlineContent->lines.size() - 1) };
+InlineIterator::LineBoxIterator LineLayout::firstLineBox() const
+{
+    if (!m_inlineContent)
+        return { };
+
+    return { InlineIterator::LineBoxIteratorModernPath(*m_inlineContent, 0) };
+}
+
+InlineIterator::LineBoxIterator LineLayout::lastLineBox() const
+{
+    if (!m_inlineContent)
+        return { };
+
+    return { InlineIterator::LineBoxIteratorModernPath(*m_inlineContent, m_inlineContent->lines.isEmpty() ? 0 : m_inlineContent->lines.size() - 1) };
 }
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h

@@ -30 +30 @@
 #include "FloatRect.h"
 #include "InlineIteratorInlineBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorTextBox.h"
 #include "LayoutIntegrationBoxTree.h"
@@ -112 +112 @@
     InlineIterator::InlineBoxIterator firstInlineBoxFor(const RenderInline&) const;
     InlineIterator::InlineBoxIterator firstRootInlineBox() const;
-    InlineIterator::LineIterator firstLine() const;
-    InlineIterator::LineIterator lastLine() const;
+    InlineIterator::LineBoxIterator firstLineBox() const;
+    InlineIterator::LineBoxIterator lastLineBox() const;
 
     LayoutRect firstInlineBoxRect(const RenderInline&) const;

trunk/Source/WebCore/layout/integration/LineSelection.h

@@ -26 +26 @@
 #pragma once
 
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "RenderBlockFlow.h"
 
@@ -33 +33 @@
 class LineSelection {
 public:
-    static float logicalTop(const InlineIterator::Line& line) { return line.contentLogicalTopAdjustedForPrecedingLine(); }
-    static float logicalBottom(const InlineIterator::Line& line) { return line.contentLogicalBottomAdjustedForFollowingLine(); }
+    static float logicalTop(const InlineIterator::LineBox& lineBox) { return lineBox.contentLogicalTopAdjustedForPrecedingLineBox(); }
+    static float logicalBottom(const InlineIterator::LineBox& lineBox) { return lineBox.contentLogicalBottomAdjustedForFollowingLineBox(); }
 
-    static FloatRect logicalRect(const InlineIterator::Line& line)
+    static FloatRect logicalRect(const InlineIterator::LineBox& lineBox)
     {
-        return { FloatPoint { line.contentLogicalLeft(), line.contentLogicalTopAdjustedForPrecedingLine() }, FloatPoint { line.contentLogicalRight(), line.contentLogicalBottomAdjustedForFollowingLine() } };
+        return { FloatPoint { lineBox.contentLogicalLeft(), lineBox.contentLogicalTopAdjustedForPrecedingLineBox() }, FloatPoint { lineBox.contentLogicalRight(), lineBox.contentLogicalBottomAdjustedForFollowingLineBox() } };
     }
 
-    static FloatRect physicalRect(const InlineIterator::Line& line)
+    static FloatRect physicalRect(const InlineIterator::LineBox& lineBox)
     {
-        auto physicalRect = logicalRect(line);
-        if (!line.isHorizontal())
+        auto physicalRect = logicalRect(lineBox);
+        if (!lineBox.isHorizontal())
             physicalRect = physicalRect.transposedRect();
-        line.containingBlock().flipForWritingMode(physicalRect);
+        lineBox.containingBlock().flipForWritingMode(physicalRect);
         return physicalRect;
     }
 
-    static float logicalTopAdjustedForPrecedingBlock(const InlineIterator::Line& line)
+    static float logicalTopAdjustedForPrecedingBlock(const InlineIterator::LineBox& lineBox)
     {
         // FIXME: Move adjustEnclosingTopForPrecedingBlock from RenderBlockFlow to here.
-        return line.containingBlock().adjustEnclosingTopForPrecedingBlock(LayoutUnit { line.contentLogicalTopAdjustedForPrecedingLine() });
+        return lineBox.containingBlock().adjustEnclosingTopForPrecedingBlock(LayoutUnit { lineBox.contentLogicalTopAdjustedForPrecedingLineBox() });
     }
 
-    static RenderObject::HighlightState selectionState(const InlineIterator::Line& line)
+    static RenderObject::HighlightState selectionState(const InlineIterator::LineBox& lineBox)
     {
-        auto& block = line.containingBlock();
+        auto& block = lineBox.containingBlock();
         if (block.selectionState() == RenderObject::HighlightState::None)
             return RenderObject::HighlightState::None;
 
         auto lineState = RenderObject::HighlightState::None;
-        for (auto box = line.firstLeafBox(); box; box.traverseNextOnLine()) {
+        for (auto box = lineBox.firstLeafBox(); box; box.traverseNextOnLine()) {
             auto boxState = box->selectionState();
             if (lineState == RenderObject::HighlightState::None)

trunk/Source/WebCore/rendering/CaretRectComputation.cpp

@@ -28 +28 @@
 
 #include "Editing.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorTextBox.h"
 #include "LineSelection.h"
@@ -111 +111 @@
 }
 
-static LayoutRect computeCaretRectForLinePosition(const InlineIterator::LineIterator& line, float logicalLeftPosition, CaretRectMode caretRectMode)
-{
-    auto& containingBlock = line->containingBlock();
-    auto lineSelectionRect = LineSelection::logicalRect(*line);
+static LayoutRect computeCaretRectForLinePosition(const InlineIterator::LineBoxIterator& lineBox, float logicalLeftPosition, CaretRectMode caretRectMode)
+{
+    auto& containingBlock = lineBox->containingBlock();
+    auto lineSelectionRect = LineSelection::logicalRect(*lineBox);
 
     int height = lineSelectionRect.height();
@@ -174 +174 @@
 
     auto& textBox = downcast<InlineIterator::TextBoxIterator>(boxAndOffset.box);
-    auto line = textBox->line();
+    auto lineBox = textBox->lineBox();
 
     float position = textBox->positionForOffset(boxAndOffset.offset);
-    return computeCaretRectForLinePosition(line, position, caretRectMode);
+    return computeCaretRectForLinePosition(lineBox, position, caretRectMode);
 }
 
@@ -187 +187 @@
         return { };
 
-    auto line = boxAndOffset.box->line();
-    return computeCaretRectForLinePosition(line, line->contentLogicalLeft(), caretRectMode);
+    auto lineBox = boxAndOffset.box->lineBox();
+    return computeCaretRectForLinePosition(lineBox, lineBox->contentLogicalLeft(), caretRectMode);
 }
 
@@ -229 +229 @@
 
     if (boxAndOffset.box) {
-        auto line = boxAndOffset.box->line();
-        auto top = line->contentLogicalTop();
+        auto lineBox = boxAndOffset.box->lineBox();
+        auto top = lineBox->contentLogicalTop();
         rect.setY(top);
-        rect.setHeight(line->contentLogicalBottom() - top);
+        rect.setHeight(lineBox->contentLogicalBottom() - top);
     }
 

trunk/Source/WebCore/rendering/InlineBoxPainter.cpp

@@ -27 +27 @@
 
 #include "GraphicsContext.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LegacyInlineFlowBox.h"
 #include "PaintInfo.h"
@@ -54 +54 @@
     , m_paintOffset(paintOffset)
     , m_renderer(m_inlineBox.renderer())
-    , m_isFirstLine(m_inlineBox.line()->isFirst())
+    , m_isFirstLineBox(m_inlineBox.lineBox()->isFirst())
     , m_isRootInlineBox(m_inlineBox.isRootInlineBox())
     , m_isHorizontal(m_inlineBox.isHorizontal())
@@ -142 +142 @@
 
     // Move x/y to our coordinates.
-    auto localRect = LayoutRect { m_inlineBox.visualRect(m_inlineBox.line()->containingBlock().logicalHeight()) };
+    auto localRect = LayoutRect { m_inlineBox.visualRect(m_inlineBox.lineBox()->containingBlock().logicalHeight()) };
     LayoutPoint adjustedPaintOffset = m_paintOffset + localRect.location();
 
@@ -214 +214 @@
     // You can use p::first-line to specify a background. If so, the root inline boxes for
     // a line may actually have to paint a background.
-    if (m_isRootInlineBox && (!m_isFirstLine || &style == &renderer().style()))
+    if (m_isRootInlineBox && (!m_isFirstLineBox || &style == &renderer().style()))
         return;
 
     // Move x/y to our coordinates.
-    auto localRect = LayoutRect { m_inlineBox.visualRect(m_inlineBox.line()->containingBlock().logicalHeight()) };
+    auto localRect = LayoutRect { m_inlineBox.visualRect(m_inlineBox.lineBox()->containingBlock().logicalHeight()) };
     LayoutPoint adjustedPaintoffset = m_paintOffset + localRect.location();
     GraphicsContext& context = m_paintInfo.context();
@@ -358 +358 @@
 const RenderStyle& InlineBoxPainter::style() const
 {
-    return m_isFirstLine ? renderer().firstLineStyle() : renderer().style();
-}
-
-}
+    return m_isFirstLineBox ? renderer().firstLineStyle() : renderer().style();
+}
+
+}

trunk/Source/WebCore/rendering/InlineBoxPainter.h

@@ -68 +68 @@
     const LayoutPoint m_paintOffset;
     const RenderBoxModelObject& m_renderer;
-    const bool m_isFirstLine;
+    const bool m_isFirstLineBox;
     const bool m_isRootInlineBox;
     const bool m_isHorizontal;

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -37 +37 @@
 #include "InlineIteratorBox.h"
 #include "InlineIteratorInlineBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorLogicalOrderTraversal.h"
 #include "InlineIteratorTextBox.h"
@@ -3062 +3062 @@
         return top;
 
-    if (auto lastLine = InlineIterator::lastLineFor(*blockBefore)) {
-        auto lastLineSelectionState = LineSelection::selectionState(*lastLine);
+    if (auto lastLineBox = InlineIterator::lastLineBoxFor(*blockBefore)) {
+        auto lastLineSelectionState = LineSelection::selectionState(*lastLineBox);
         if (lastLineSelectionState != RenderObject::HighlightState::Inside && lastLineSelectionState != RenderObject::HighlightState::Start)
             return top;
 
-        auto lastLineSelectionBottom = LineSelection::logicalBottom(*lastLine) + offsetToBlockBefore.height();
+        auto lastLineSelectionBottom = LineSelection::logicalBottom(*lastLineBox) + offsetToBlockBefore.height();
         top = std::max(top, LayoutUnit { lastLineSelectionBottom });
     }
@@ -3088 +3088 @@
     }
 
-    auto hasSelectedChildren = [&](const InlineIterator::LineIterator& line) {
-        return LineSelection::selectionState(*line) != RenderObject::HighlightState::None;
+    auto hasSelectedChildren = [&](const InlineIterator::LineBoxIterator& lineBox) {
+        return LineSelection::selectionState(*lineBox) != RenderObject::HighlightState::None;
     };
 
-    auto lineSelectionGap = [&](const InlineIterator::LineIterator& line, LayoutUnit selTop, LayoutUnit selHeight) -> GapRects {
-        auto lineState = LineSelection::selectionState(*line);
+    auto lineSelectionGap = [&](const InlineIterator::LineBoxIterator& lineBox, LayoutUnit selTop, LayoutUnit selHeight) -> GapRects {
+        auto lineState = LineSelection::selectionState(*lineBox);
 
         bool leftGap, rightGap;
@@ -3101 +3101 @@
 
         auto firstSelectedBox = [&]() -> InlineIterator::LeafBoxIterator {
-            for (auto box = line->firstLeafBox(); box; box.traverseNextOnLine()) {
+            for (auto box = lineBox->firstLeafBox(); box; box.traverseNextOnLine()) {
                 if (box->selectionState() != RenderObject::HighlightState::None)
                     return box;
@@ -3109 +3109 @@
 
         auto lastSelectedBox = [&]() -> InlineIterator::LeafBoxIterator {
-            for (auto box = line->lastLeafBox(); box; box.traversePreviousOnLine()) {
+            for (auto box = lineBox->lastLeafBox(); box; box.traversePreviousOnLine()) {
                 if (box->selectionState() != RenderObject::HighlightState::None)
                     return box;
@@ -3158 +3158 @@
     };
 
-    InlineIterator::LineIterator lastSelectedLine;
-    InlineIterator::LineIterator line = InlineIterator::firstLineFor(*this);
-    for (; line && !hasSelectedChildren(line); line.traverseNext()) { }
+    InlineIterator::LineBoxIterator lastSelectedLineBox;
+    auto lineBox = InlineIterator::firstLineBoxFor(*this);
+    for (; lineBox && !hasSelectedChildren(lineBox); lineBox.traverseNext()) { }
 
     GapRects result;
 
     // Now paint the gaps for the lines.
-    for (; line && hasSelectedChildren(line); line.traverseNext()) {
-        auto selectionTop =  LayoutUnit { LineSelection::logicalTopAdjustedForPrecedingBlock(*line) };
-        auto selectionHeight = LayoutUnit { std::max(0.f, LineSelection::logicalBottom(*line) - selectionTop) };
-
-        if (!containsStart && !lastSelectedLine &&
-            selectionState() != HighlightState::Start && selectionState() != HighlightState::Both && !isRubyBase())
+    for (; lineBox && hasSelectedChildren(lineBox); lineBox.traverseNext()) {
+        auto selectionTop =  LayoutUnit { LineSelection::logicalTopAdjustedForPrecedingBlock(*lineBox) };
+        auto selectionHeight = LayoutUnit { std::max(0.f, LineSelection::logicalBottom(*lineBox) - selectionTop) };
+
+        if (!containsStart && !lastSelectedLineBox
+            && selectionState() != HighlightState::Start
+            && selectionState() != HighlightState::Both && !isRubyBase())
             result.uniteCenter(blockSelectionGap(rootBlock, rootBlockPhysicalPosition, offsetFromRootBlock, lastLogicalTop, lastLogicalLeft, lastLogicalRight, selectionTop, cache, paintInfo));
 
-        LayoutRect logicalRect { LayoutUnit(line->contentLogicalLeft()), selectionTop, LayoutUnit(line->contentLogicalWidth()), selectionTop + selectionHeight };
+        LayoutRect logicalRect { LayoutUnit(lineBox->contentLogicalLeft()), selectionTop, LayoutUnit(lineBox->contentLogicalWidth()), selectionTop + selectionHeight };
         logicalRect.move(isHorizontalWritingMode() ? offsetFromRootBlock : offsetFromRootBlock.transposedSize());
         LayoutRect physicalRect = rootBlock.logicalRectToPhysicalRect(rootBlockPhysicalPosition, logicalRect);
         if (!paintInfo || (isHorizontalWritingMode() && physicalRect.y() < paintInfo->rect.maxY() && physicalRect.maxY() > paintInfo->rect.y())
             || (!isHorizontalWritingMode() && physicalRect.x() < paintInfo->rect.maxX() && physicalRect.maxX() > paintInfo->rect.x()))
-            result.unite(lineSelectionGap(line, selectionTop, selectionHeight));
-
-        lastSelectedLine = line;
-    }
-
-    if (containsStart && !lastSelectedLine)
+            result.unite(lineSelectionGap(lineBox, selectionTop, selectionHeight));
+
+        lastSelectedLineBox = lineBox;
+    }
+
+    if (containsStart && !lastSelectedLineBox) {
         // VisibleSelection must start just after our last line.
-        lastSelectedLine = InlineIterator::lastLineFor(*this);
-
-    if (lastSelectedLine && selectionState() != HighlightState::End && selectionState() != HighlightState::Both) {
+        lastSelectedLineBox = InlineIterator::lastLineBoxFor(*this);
+    }
+
+    if (lastSelectedLineBox && selectionState() != HighlightState::End && selectionState() != HighlightState::Both) {
         // Update our lastY to be the bottom of the last selected line.
-        auto lastLineSelectionBottom = LayoutUnit { LineSelection::logicalBottom(*lastSelectedLine) };
+        auto lastLineSelectionBottom = LayoutUnit { LineSelection::logicalBottom(*lastSelectedLineBox) };
         lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + lastLineSelectionBottom;
         lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, lastLineSelectionBottom, cache);
@@ -3274 +3276 @@
 bool RenderBlockFlow::containsNonZeroBidiLevel() const
 {
-    for (auto line = InlineIterator::firstLineFor(*this); line; line.traverseNext()) {
-        for (auto box = line->firstLeafBox(); box; box = box.traverseNextOnLine()) {
+    for (auto lineBox = InlineIterator::firstLineBoxFor(*this); lineBox; lineBox.traverseNext()) {
+        for (auto box = lineBox->firstLeafBox(); box; box = box.traverseNextOnLine()) {
             if (box->bidiLevel())
                 return true;
@@ -3354 +3356 @@
 
             if (localPoint.y() > *previousRootInlineBoxBottom && localPoint.y() < box->logicalTop()) {
-                auto closestBox = closestBoxForHorizontalPosition(*box->line(), localPoint.x());
+                auto closestBox = closestBoxForHorizontalPosition(*box->lineBox(), localPoint.x());
                 if (closestBox && is<RenderText>(closestBox->renderer()))
                     return const_cast<RenderText*>(&downcast<RenderText>(closestBox->renderer()));
@@ -3368 +3370 @@
     ASSERT(childrenInline());
 
-    auto firstLine = InlineIterator::firstLineFor(*this);
-
-    if (!firstLine)
+    auto firstLineBox = InlineIterator::firstLineBoxFor(*this);
+
+    if (!firstLineBox)
         return createVisiblePosition(0, Affinity::Downstream);
 
@@ -3378 +3380 @@
     // look for the closest line box in the root box which is at the passed-in y coordinate
     InlineIterator::LeafBoxIterator closestBox;
-    InlineIterator::LineIterator firstLineWithChildren;
-    InlineIterator::LineIterator lastLineWithChildren;
-    for (auto line = firstLine; line; line.traverseNext()) {
-        if (fragment && line->containingFragment() != fragment)
+    InlineIterator::LineBoxIterator firstLineBoxWithChildren;
+    InlineIterator::LineBoxIterator lastLineBoxWithChildren;
+    for (auto lineBox = firstLineBox; lineBox; lineBox.traverseNext()) {
+        if (fragment && lineBox->containingFragment() != fragment)
             continue;
 
-        if (!line->firstLeafBox())
+        if (!lineBox->firstLeafBox())
             continue;
-        if (!firstLineWithChildren)
-            firstLineWithChildren = line;
-
-        if (!linesAreFlipped && line->isFirstAfterPageBreak()
-            && (pointInLogicalContents.y() < line->lineBoxTop() || (blocksAreFlipped && pointInLogicalContents.y() == line->lineBoxTop())))
+        if (!firstLineBoxWithChildren)
+            firstLineBoxWithChildren = lineBox;
+
+        if (!linesAreFlipped && lineBox->isFirstAfterPageBreak()
+            && (pointInLogicalContents.y() < lineBox->top() || (blocksAreFlipped && pointInLogicalContents.y() == lineBox->top())))
             break;
 
-        lastLineWithChildren = line;
+        lastLineBoxWithChildren = lineBox;
 
         // check if this root line box is located at this y coordinate
-        auto selectionBottom = LineSelection::logicalBottom(*line);
+        auto selectionBottom = LineSelection::logicalBottom(*lineBox);
         if (pointInLogicalContents.y() < selectionBottom || (blocksAreFlipped && pointInLogicalContents.y() == selectionBottom)) {
             if (linesAreFlipped) {
-                auto nextLineWithChildren = line->next();
-                while (nextLineWithChildren && !nextLineWithChildren->firstLeafBox())
-                    nextLineWithChildren.traverseNext();
-
-                if (nextLineWithChildren && nextLineWithChildren->isFirstAfterPageBreak()
-                    && (pointInLogicalContents.y() > nextLineWithChildren->lineBoxTop() || (!blocksAreFlipped && pointInLogicalContents.y() == nextLineWithChildren->lineBoxTop())))
+                auto nextLineBoxWithChildren = lineBox->next();
+                while (nextLineBoxWithChildren && !nextLineBoxWithChildren->firstLeafBox())
+                    nextLineBoxWithChildren.traverseNext();
+
+                if (nextLineBoxWithChildren && nextLineBoxWithChildren->isFirstAfterPageBreak()
+                    && (pointInLogicalContents.y() > nextLineBoxWithChildren->top() || (!blocksAreFlipped && pointInLogicalContents.y() == nextLineBoxWithChildren->top())))
                     continue;
             }
-            closestBox = closestBoxForHorizontalPosition(*line, pointInLogicalContents.x());
+            closestBox = closestBoxForHorizontalPosition(*lineBox, pointInLogicalContents.x());
             if (closestBox)
                 break;
@@ -3415 +3417 @@
     bool moveCaretToBoundary = frame().editor().behavior().shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom();
 
-    if (!moveCaretToBoundary && !closestBox && lastLineWithChildren) {
+    if (!moveCaretToBoundary && !closestBox && lastLineBoxWithChildren) {
         // y coordinate is below last root line box, pretend we hit it
-        closestBox = closestBoxForHorizontalPosition(*lastLineWithChildren, pointInLogicalContents.x());
+        closestBox = closestBoxForHorizontalPosition(*lastLineBoxWithChildren, pointInLogicalContents.x());
     }
 
     if (closestBox) {
         if (moveCaretToBoundary) {
-            auto firstLineWithChildrenTop = LayoutUnit { std::min(previousLineContentBottomOrBorderAndPadding(*firstLineWithChildren), firstLineWithChildren->contentLogicalTop()) };
+            auto firstLineWithChildrenTop = LayoutUnit { std::min(previousLineBoxContentBottomOrBorderAndPadding(*firstLineBoxWithChildren), firstLineBoxWithChildren->contentLogicalTop()) };
             if (pointInLogicalContents.y() < firstLineWithChildrenTop
                 || (blocksAreFlipped && pointInLogicalContents.y() == firstLineWithChildrenTop)) {
-                auto box = firstLineWithChildren->firstLeafBox();
+                auto box = firstLineBoxWithChildren->firstLeafBox();
                 if (box->isLineBreak()) {
                     if (auto next = box->nextOnLineIgnoringLineBreak())
@@ -3436 +3438 @@
 
         // pass the box a top position that is inside it
-        auto point = LayoutPoint { pointInLogicalContents.x(), contentStartInBlockDirection(*closestBox->line()) };
+        auto point = LayoutPoint { pointInLogicalContents.x(), contentStartInBlockDirection(*closestBox->lineBox()) };
         if (!isHorizontalWritingMode())
             point = point.transposedPoint();
@@ -3444 +3446 @@
     }
 
-    if (lastLineWithChildren) {
+    if (lastLineBoxWithChildren) {
         // We hit this case for Mac behavior when the Y coordinate is below the last box.
         ASSERT(moveCaretToBoundary);
         InlineIterator::LineLogicalOrderCache orderCache;
-        if (auto logicallyLastBox = InlineIterator::lastLeafOnLineInLogicalOrderWithNode(lastLineWithChildren, orderCache))
+        if (auto logicallyLastBox = InlineIterator::lastLeafOnLineInLogicalOrderWithNode(lastLineBoxWithChildren, orderCache))
             return positionForRun(*this, logicallyLastBox, false);
     }
@@ -3472 +3474 @@
     ASSERT(childrenInline());
     for (auto box = InlineIterator::firstRootInlineBoxFor(*this); box; box.traverseNextInlineBox()) {
-        auto line = box->line();
+        auto lineBox = box->lineBox();
         // FIXME: This is mixing physical and logical coordinates.
         auto unflippedVisualRect = box->visualRectIgnoringBlockDirection();
-        auto top = std::max(line->contentLogicalTop(), unflippedVisualRect.y());
-        auto bottom = std::min(line->contentLogicalBottom(), unflippedVisualRect.maxY());
+        auto top = std::max(lineBox->contentLogicalTop(), unflippedVisualRect.y());
+        auto bottom = std::min(lineBox->contentLogicalBottom(), unflippedVisualRect.maxY());
         auto rect = LayoutRect { LayoutUnit { additionalOffset.x() + unflippedVisualRect.x() }
             , additionalOffset.y() + top

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -48 +48 @@
 #include "HitTestResult.h"
 #include "InlineIteratorInlineBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineRunAndOffset.h"
 #include "LayoutIntegrationLineLayout.h"

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -41 +41 @@
 #include "HTMLImageElement.h"
 #include "HTMLNames.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorTextBox.h"
 #include "LengthFunctions.h"
@@ -1592 +1592 @@
                 auto& textRenderer = downcast<RenderText>(*o);
                 if (auto run = InlineIterator::firstTextBoxFor(textRenderer))
-                    point.move(textRenderer.linesBoundingBox().x(), run->line()->contentLogicalTop());
+                    point.move(textRenderer.linesBoundingBox().x(), run->lineBox()->contentLogicalTop());
             } else if (is<RenderBox>(*o))
                 point.moveBy(downcast<RenderBox>(*o).location());

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -48 +48 @@
 #include "ImageOverlay.h"
 #include "InlineIteratorInlineBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LineSelection.h"
 #include "Page.h"
@@ -111 +111 @@
         }
     } else {
-        auto selectionLogicalRect = LineSelection::logicalRect(*run->line());
+        auto selectionLogicalRect = LineSelection::logicalRect(*run->lineBox());
         int selectionTop = !containingBlock->style().isFlippedBlocksWritingMode() ? selectionLogicalRect.y() - logicalTop() : logicalBottom() - selectionLogicalRect.maxY();
         int selectionHeight = selectionLogicalRect.height();

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -30 +30 @@
 #include "HitTestResult.h"
 #include "InlineIteratorInlineBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LayoutIntegrationLineLayout.h"
 #include "LegacyInlineElementBox.h"
@@ -974 +974 @@
 
     for (auto box = InlineIterator::firstInlineBoxFor(*this); box; box.traverseNextInlineBox()) {
-        auto line = box->line();
-        auto top = LayoutUnit { std::max(line->contentLogicalTop(), box->logicalTop()) };
-        auto bottom = LayoutUnit { std::min(line->contentLogicalBottom(), box->logicalBottom()) };
+        auto lineBox = box->lineBox();
+        auto top = LayoutUnit { std::max(lineBox->contentLogicalTop(), box->logicalTop()) };
+        auto bottom = LayoutUnit { std::min(lineBox->contentLogicalBottom(), box->logicalBottom()) };
         // FIXME: This is mixing physical and logical coordinates.
         rects.append({ LayoutUnit(box->visualRectIgnoringBlockDirection().x()), top, LayoutUnit(box->logicalWidth()), bottom - top });

trunk/Source/WebCore/rendering/RenderLineBreak.cpp

@@ -28 +28 @@
 #include "HTMLWBRElement.h"
 #include "InlineIteratorBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineRunAndOffset.h"
 #include "LegacyInlineElementBox.h"
@@ -187 +187 @@
     if (!run)
         return;
-    auto line = run->line();
-
-    auto lineSelectionRect = LineSelection::logicalRect(*line);
+    auto lineBox = run->lineBox();
+
+    auto lineSelectionRect = LineSelection::logicalRect(*lineBox);
     LayoutRect rect = IntRect(run->logicalLeft(), lineSelectionRect.y(), 0, lineSelectionRect.height());
-    if (!line->isHorizontal())
+    if (!lineBox->isHorizontal())
         rect = rect.transposedRect();
 
-    if (line->isFirstAfterPageBreak()) {
+    if (lineBox->isFirstAfterPageBreak()) {
         if (run->isHorizontal())
-            rect.shiftYEdgeTo(line->lineBoxTop());
+            rect.shiftYEdgeTo(lineBox->top());
         else
-            rect.shiftXEdgeTo(line->lineBoxTop());
+            rect.shiftXEdgeTo(lineBox->top());
     }
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -36 +36 @@
 #include "HighlightRegister.h"
 #include "InlineIteratorBox.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LayoutRepainter.h"
 #include "LineSelection.h"
@@ -722 +722 @@
     auto [top, bottom] = [&]() -> std::pair<float, float> {
         if (auto run = InlineIterator::boxFor(*this)) {
-            auto line = run->line();
-            auto lineContentTop = LayoutUnit { std::min(previousLineContentBottomOrBorderAndPadding(*line), line->contentLogicalTop()) };
-            return std::make_pair(lineContentTop, LineSelection::logicalBottom(*line));
+            auto lineBox = run->lineBox();
+            auto lineContentTop = LayoutUnit { std::min(previousLineBoxContentBottomOrBorderAndPadding(*lineBox), lineBox->contentLogicalTop()) };
+            return std::make_pair(lineContentTop, LineSelection::logicalBottom(*lineBox));
         }
         return std::make_pair(logicalTop(), logicalBottom());

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -37 +37 @@
 #include "HTMLParserIdioms.h"
 #include "Hyphenation.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorLogicalOrderTraversal.h"
 #include "InlineIteratorTextBox.h"
@@ -343 +343 @@
         }
 
-        if (run->line()->isFirstAfterPageBreak()) {
+        if (run->lineBox()->isFirstAfterPageBreak()) {
             if (run->isHorizontal())
-                rect.shiftYEdgeTo(run->line()->lineBoxTop());
+                rect.shiftYEdgeTo(run->lineBox()->top());
             else
-                rect.shiftXEdgeTo(run->line()->lineBoxTop());
+                rect.shiftXEdgeTo(run->lineBox()->top());
         }
 
@@ -674 +674 @@
             run.traverseNextTextBox();
 
-        auto line = run->line();
-        auto top = LayoutUnit { std::min(previousLineContentBottomOrBorderAndPadding(*line), line->contentLogicalTop()) };
+        auto lineBox = run->lineBox();
+        auto top = LayoutUnit { std::min(previousLineBoxContentBottomOrBorderAndPadding(*lineBox), lineBox->contentLogicalTop()) };
         if (pointBlockDirection > top || (!blocksAreFlipped && pointBlockDirection == top)) {
-            auto bottom = LineSelection::logicalBottom(*line);
-            if (auto nextLine = line->next())
-                bottom = std::min(bottom, nextLine->contentLogicalTop());
+            auto bottom = LineSelection::logicalBottom(*lineBox);
+            if (auto nextLineBox = lineBox->next())
+                bottom = std::min(bottom, nextLineBox->contentLogicalTop());
 
             if (pointBlockDirection < bottom || (blocksAreFlipped && pointBlockDirection == bottom)) {

trunk/Source/WebCore/rendering/TextBoxPainter.cpp

@@ -30 +30 @@
 #include "EventRegion.h"
 #include "GraphicsContext.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "LegacyInlineTextBox.h"
 #include "LineSelection.h"
@@ -67 +67 @@
     , m_selectableRange(m_textBox->selectableRange())
     , m_paintRect(computePaintRect(paintOffset))
-    , m_isFirstLine(m_textBox->line()->isFirst())
+    , m_isFirstLine(m_textBox->lineBox()->isFirst())
     , m_isPrinting(m_document.printing())
     , m_haveSelection(computeHaveSelection())
@@ -290 +290 @@
     // Note that if the text is truncated, we let the thing being painted in the truncation
     // draw its own highlight.
-    auto line = textBox().line();
-    auto selectionBottom = LineSelection::logicalBottom(*line);
-    auto selectionTop = LineSelection::logicalTopAdjustedForPrecedingBlock(*line);
+    auto lineBox = textBox().lineBox();
+    auto selectionBottom = LineSelection::logicalBottom(*lineBox);
+    auto selectionTop = LineSelection::logicalTopAdjustedForPrecedingBlock(*lineBox);
     // Use same y positioning and height as for selection, so that when the selection and this subrange are on
     // the same word there are no pieces sticking out.
@@ -447 +447 @@
     if (!textBox->logicalLeft())
         return 0;
-    return textBox->logicalLeft() - textBox->line()->contentLogicalLeft();
+    return textBox->logicalLeft() - textBox->lineBox()->contentLogicalLeft();
 }
 
@@ -571 +571 @@
     localPaintOffset.move(0, m_style.isHorizontalWritingMode() ? 0 : -textBox().logicalHeight());
 
-    auto boxOrigin = textBox().visualRect(textBox().line()->containingBlock().logicalHeight()).location();
+    auto boxOrigin = textBox().visualRect(textBox().lineBox()->containingBlock().logicalHeight()).location();
     boxOrigin.moveBy(localPaintOffset);
     return { boxOrigin, FloatSize(textBox().logicalWidth(), textBox().logicalHeight()) };

trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp

@@ -312 +312 @@
 void SVGRootInlineBox::reorderValueListsToLogicalOrder(Vector<SVGTextLayoutAttributes*>& attributes)
 {
-    auto line = InlineIterator::LineIterator(this);
-
-    InlineIterator::leafBoxesInLogicalOrder(line, [&](auto first, auto last) {
+    auto lineBox = InlineIterator::LineBoxIterator(this);
+
+    InlineIterator::leafBoxesInLogicalOrder(lineBox, [&](auto first, auto last) {
         reverseInlineBoxRangeAndValueListsIfNeeded(attributes, first, last);
     });

trunk/Source/WebCore/style/InlineTextBoxStyle.cpp

@@ -30 +30 @@
 #include "HTMLAnchorElement.h"
 #include "HTMLNames.h"
-#include "InlineIteratorLine.h"
+#include "InlineIteratorLineBox.h"
 #include "InlineIteratorTextBox.h"
 #include "LegacyInlineTextBox.h"
@@ -50 +50 @@
 }
 
-static void minLogicalTopForTextDecorationLine(const InlineIterator::LineIterator& line, float& minLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
-{
-    for (auto run = line->firstLeafBox(); run; run.traverseNextOnLine()) {
+static void minLogicalTopForTextDecorationLine(const InlineIterator::LineBoxIterator& lineBox, float& minLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
+{
+    for (auto run = lineBox->firstLeafBox(); run; run.traverseNextOnLine()) {
         if (run->renderer().isOutOfFlowPositioned())
             continue; // Positioned placeholders don't affect calculations.
@@ -67 +67 @@
 }
 
-static void maxLogicalBottomForTextDecorationLine(const InlineIterator::LineIterator& line, float& maxLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
-{
-    for (auto run = line->firstLeafBox(); run; run.traverseNextOnLine()) {
+static void maxLogicalBottomForTextDecorationLine(const InlineIterator::LineBoxIterator& lineBox, float& maxLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
+{
+    for (auto run = lineBox->firstLeafBox(); run; run.traverseNextOnLine()) {
         if (run->renderer().isOutOfFlowPositioned())
             continue; // Positioned placeholders don't affect calculations.
@@ -120 +120 @@
     if (resolvedUnderlinePosition == TextUnderlinePosition::Auto && underlineOffset.isAuto()) {
         if (textRun)
-            resolvedUnderlinePosition = textRun->line()->baselineType() == IdeographicBaseline ? TextUnderlinePosition::Under : TextUnderlinePosition::Auto;
+            resolvedUnderlinePosition = textRun->lineBox()->baselineType() == IdeographicBaseline ? TextUnderlinePosition::Under : TextUnderlinePosition::Auto;
         else
             resolvedUnderlinePosition = TextUnderlinePosition::Auto;
@@ -135 +135 @@
         ASSERT(textRun);
         // Position underline relative to the bottom edge of the lowest element's content box.
-        auto line = textRun->line();
-        auto* decorationRenderer = enclosingRendererWithTextDecoration(textRun->renderer(), TextDecorationLine::Underline, line->isFirst());
+        auto lineBox = textRun->lineBox();
+        auto* decorationRenderer = enclosingRendererWithTextDecoration(textRun->renderer(), TextDecorationLine::Underline, lineBox->isFirst());
         
         float offset;
         if (textRun->renderer().style().isFlippedLinesWritingMode()) {
             offset = textRun->logicalTop();
-            minLogicalTopForTextDecorationLine(line, offset, decorationRenderer, TextDecorationLine::Underline);
+            minLogicalTopForTextDecorationLine(lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
             offset = textRun->logicalTop() - offset;
         } else {
             offset = textRun->logicalBottom();
-            maxLogicalBottomForTextDecorationLine(line, offset, decorationRenderer, TextDecorationLine::Underline);
+            maxLogicalBottomForTextDecorationLine(lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
             offset -= textRun->logicalBottom();
         }