[webkit-changes] [WebKit/WebKit] 602377: Factor multicolumn line adjustment code to use the...

[Antti Koivisto]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 6023775ee58b2e18b4cdf71382ffd98ca1c58682
      https://github.com/WebKit/WebKit/commit/6023775ee58b2e18b4cdf71382ffd98ca1c58682
  Author: Antti Koivisto <antti at apple.com>
  Date:   2023-02-19 (Sun, 19 Feb 2023)

  Changed paths:
    M Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h
    M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h
    M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h
    M Source/WebCore/rendering/LegacyInlineFlowBox.cpp
    M Source/WebCore/rendering/LegacyInlineFlowBox.h
    M Source/WebCore/rendering/LegacyLineLayout.cpp
    M Source/WebCore/rendering/RenderBlockFlow.cpp
    M Source/WebCore/rendering/RenderBlockFlow.h

  Log Message:
  -----------
  Factor multicolumn line adjustment code to use the inline iterator
https://bugs.webkit.org/show_bug.cgi?id=252546
rdar://105651636

Reviewed by Alan Baradlay.

So we can share code with IFC integration and legacy.

* Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h:
(WebCore::InlineIterator::LineBox::lineIndex const):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h:
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::lineIndex const):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h:
(WebCore::InlineIterator::LineBoxIteratorModernPath::lineIndex const):
* Source/WebCore/rendering/LegacyInlineFlowBox.cpp:
(WebCore::LegacyInlineFlowBox::computeReplacedAndTextLineTopAndBottom const): Deleted.
* Source/WebCore/rendering/LegacyInlineFlowBox.h:
* Source/WebCore/rendering/LegacyLineLayout.cpp:
(WebCore::LegacyLineLayout::layoutRunsAndFloatsInRange):
(WebCore::LegacyLineLayout::linkToEndLineIfNeeded):
(WebCore::LegacyLineLayout::determineStartPosition):
(WebCore::LegacyLineLayout::checkPaginationAndFloatsAtEndLine):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::calculateMinimumPageHeight):
(WebCore::needsAppleMailPaginationQuirk):
(WebCore::RenderBlockFlow::adjustLinePositionForPagination):
(WebCore::RenderBlockFlow::computeLineAdjustmentForPagination):

Split into two functions for computing the adjustments and applying them to legacy lineboxes.

* Source/WebCore/rendering/RenderBlockFlow.h:

Canonical link: https://commits.webkit.org/260525@main