[webkit-changes] [WebKit/WebKit] 70fb31: Remove LegacyEllipsisBox

Antti Koivisto noreply at github.com
Wed Mar 13 13:26:41 PDT 2024


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 70fb31eed2b668ecf8ac2bf9492d4918856ab2eb
      https://github.com/WebKit/WebKit/commit/70fb31eed2b668ecf8ac2bf9492d4918856ab2eb
  Author: Antti Koivisto <antti at apple.com>
  Date:   2024-03-13 (Wed, 13 Mar 2024)

  Changed paths:
    M Source/WebCore/Headers.cmake
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h
    M Source/WebCore/rendering/EllipsisBoxPainter.cpp
    R Source/WebCore/rendering/LegacyEllipsisBox.cpp
    R Source/WebCore/rendering/LegacyEllipsisBox.h
    M Source/WebCore/rendering/LegacyInlineBox.cpp
    M Source/WebCore/rendering/LegacyInlineBox.h
    M Source/WebCore/rendering/LegacyInlineFlowBox.cpp
    M Source/WebCore/rendering/LegacyInlineFlowBox.h
    M Source/WebCore/rendering/LegacyInlineTextBox.cpp
    M Source/WebCore/rendering/LegacyInlineTextBox.h
    M Source/WebCore/rendering/LegacyLineLayout.cpp
    M Source/WebCore/rendering/LegacyLineLayout.h
    M Source/WebCore/rendering/LegacyRootInlineBox.cpp
    M Source/WebCore/rendering/LegacyRootInlineBox.h
    M Source/WebCore/rendering/RenderBlock.h
    M Source/WebCore/rendering/RenderBlockFlow.h
    M Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
    M Source/WebCore/rendering/RenderElement.cpp
    M Source/WebCore/rendering/RenderElement.h
    M Source/WebCore/rendering/RenderText.cpp
    M Source/WebCore/rendering/RenderTextLineBoxes.cpp
    M Source/WebCore/rendering/svg/SVGInlineTextBox.cpp

  Log Message:
  -----------
  Remove LegacyEllipsisBox
https://bugs.webkit.org/show_bug.cgi?id=270914
rdar://124538996

Reviewed by Alan Baradlay.

We now only use LegacyInlineBoxes for SVG which doesn't support ellipsis (or have a concept of text overflow in general).

* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h:
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::hasEllipsis const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::ellipsisVisualRectIgnoringBlockDirection const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::ellipsisText const):
* Source/WebCore/rendering/EllipsisBoxPainter.cpp:
* Source/WebCore/rendering/LegacyEllipsisBox.cpp: Removed.
* Source/WebCore/rendering/LegacyEllipsisBox.h: Removed.
* Source/WebCore/rendering/LegacyInlineBox.cpp:
(WebCore::LegacyInlineBox::selectionState const):
(WebCore::LegacyInlineBox::canAccommodateEllipsis const): Deleted.
(WebCore::LegacyInlineBox::placeEllipsisBox): Deleted.
* Source/WebCore/rendering/LegacyInlineBox.h:
(WebCore::LegacyInlineBox::isInlineTextBox const):
(WebCore::LegacyInlineBox::setEndsWithBreak):
(WebCore::LegacyInlineBox::isEllipsisBox const): Deleted.
(WebCore::LegacyInlineBox::clearTruncation): Deleted.
(WebCore::LegacyInlineBox::hasEllipsisBox const): Deleted.
(WebCore::LegacyInlineBox::setHasEllipsisBox): Deleted.
* Source/WebCore/rendering/LegacyInlineFlowBox.cpp:
(WebCore::LegacyInlineFlowBox::nodeAtPoint):
(WebCore::LegacyInlineFlowBox::canAccommodateEllipsis const): Deleted.
(WebCore::LegacyInlineFlowBox::placeEllipsisBox): Deleted.
(WebCore::LegacyInlineFlowBox::clearTruncation): Deleted.
* Source/WebCore/rendering/LegacyInlineFlowBox.h:
* Source/WebCore/rendering/LegacyInlineTextBox.cpp:
(WebCore::LegacyInlineTextBox::nodeAtPoint):
(WebCore::LegacyInlineTextBox::paint):
(WebCore::LegacyInlineTextBox::selectableRange const):
(WebCore::LegacyInlineTextBox::placeEllipsisBox): Deleted.
* Source/WebCore/rendering/LegacyInlineTextBox.h:
(WebCore::LegacyInlineTextBox::truncation const): Deleted.
* Source/WebCore/rendering/LegacyLineLayout.cpp:
(WebCore::LegacyLineLayout::layoutLineBoxes):
(WebCore::LegacyLineLayout::deleteEllipsisLineBoxes): Deleted.
(WebCore::LegacyLineLayout::checkLinesForTextOverflow): Deleted.
* Source/WebCore/rendering/LegacyLineLayout.h:
* Source/WebCore/rendering/LegacyRootInlineBox.cpp:
(WebCore::LegacyRootInlineBox::~LegacyRootInlineBox):
(WebCore::LegacyRootInlineBox::adjustPosition):
(WebCore::LegacyRootInlineBox::detachEllipsisBox): Deleted.
(WebCore::LegacyRootInlineBox::clearTruncation): Deleted.
(WebCore::LegacyRootInlineBox::lineCanAccommodateEllipsis): Deleted.
(WebCore::LegacyRootInlineBox::placeEllipsis): Deleted.
(WebCore::LegacyRootInlineBox::placeEllipsisBox): Deleted.
(WebCore::LegacyRootInlineBox::paintEllipsisBox const): Deleted.
(WebCore::LegacyRootInlineBox::paint): Deleted.
(WebCore::LegacyRootInlineBox::nodeAtPoint): Deleted.
(WebCore::LegacyRootInlineBox::ellipsisBox const): Deleted.
* Source/WebCore/rendering/LegacyRootInlineBox.h:
* Source/WebCore/rendering/RenderBlock.h:
* Source/WebCore/rendering/RenderBlockFlow.h:
(WebCore::RenderBlockFlow::setHasMarkupTruncation): Deleted.
(WebCore::RenderBlockFlow::hasMarkupTruncation const): Deleted.
* Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):

Remove all of legacy linebox line clamp, not just the ellipsis placement part as none of it is needed for SVG.

(WebCore::RenderDeprecatedFlexibleBox::clearLineClamp):
(WebCore::shouldIncludeLinesForParentLineCount): Deleted.
(WebCore::clearTruncation): Deleted.
(WebCore::lineAtIndex): Deleted.
(WebCore::getHeightForLineCount): Deleted.
(WebCore::heightForLineCount): Deleted.
* Source/WebCore/rendering/RenderElement.cpp:
(WebCore::RenderElement::RenderElement):
* Source/WebCore/rendering/RenderElement.h:
(WebCore::RenderElement::setRenderBlockFlowLineLayoutPath):
(WebCore::RenderElement::renderBlockFlowLineLayoutPath const):
(WebCore::RenderElement::setRenderBlockFlowHasMarkupTruncation): Deleted.
(WebCore::RenderElement::renderBlockFlowHasMarkupTruncation const): Deleted.
* Source/WebCore/rendering/RenderText.cpp:
* Source/WebCore/rendering/RenderTextLineBoxes.cpp:
* Source/WebCore/rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paintSelectionBackground):
(WebCore::SVGInlineTextBox::paint):

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



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications


More information about the webkit-changes mailing list