[webkit-changes] [WebKit/WebKit] 4df04a: Remove LegacyInlineElementBox

Antti Koivisto noreply at github.com
Thu Mar 14 10:21:03 PDT 2024


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 4df04aca977711ad0e43a3abc8dbac268c319555
      https://github.com/WebKit/WebKit/commit/4df04aca977711ad0e43a3abc8dbac268c319555
  Author: Antti Koivisto <antti at apple.com>
  Date:   2024-03-14 (Thu, 14 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/InlineIteratorBox.cpp
    M Source/WebCore/layout/integration/inline/InlineIteratorBox.h
    M Source/WebCore/rendering/LegacyInlineBox.h
    R Source/WebCore/rendering/LegacyInlineElementBox.cpp
    R Source/WebCore/rendering/LegacyInlineElementBox.h
    M Source/WebCore/rendering/LegacyInlineFlowBox.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/RenderBlockFlow.cpp
    M Source/WebCore/rendering/RenderBox.cpp
    M Source/WebCore/rendering/RenderBox.h
    M Source/WebCore/rendering/RenderFragmentedFlow.cpp
    M Source/WebCore/rendering/RenderInline.cpp
    M Source/WebCore/rendering/RenderLineBoxList.cpp
    M Source/WebCore/rendering/RenderLineBreak.cpp
    M Source/WebCore/rendering/RenderLineBreak.h
    M Source/WebCore/rendering/RenderListItem.cpp
    M Source/WebCore/rendering/RenderListItem.h
    M Source/WebCore/rendering/RenderListMarker.cpp
    M Source/WebCore/rendering/RenderListMarker.h
    M Source/WebCore/rendering/RenderReplaced.cpp
    M Source/WebCore/rendering/RenderText.cpp
    M Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

  Log Message:
  -----------
  Remove LegacyInlineElementBox
https://bugs.webkit.org/show_bug.cgi?id=270966
rdar://124610531

Reviewed by Alan Baradlay.

LegacyInlineBoxes are now only needed for SVG rendering. LegacyInlineElementBox represents
replaced elements, <br>s and list markers, none of which can exist in SVG inline tree.

* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/layout/integration/inline/InlineIteratorBox.cpp:
(WebCore::InlineIterator::boxFor):
* Source/WebCore/layout/integration/inline/InlineIteratorBox.h:
* Source/WebCore/rendering/LegacyInlineBox.h:
(WebCore::LegacyInlineBox::InlineBoxBitfields::InlineBoxBitfields):
(WebCore::LegacyInlineBox::behavesLikeText const): Deleted.
(WebCore::LegacyInlineBox::setBehavesLikeText): Deleted.

Also coded dealing with behavesLikeText etc that only applies to LegacyInlineElementBox.

(WebCore::LegacyInlineBox::isInlineElementBox const): Deleted.
* Source/WebCore/rendering/LegacyInlineElementBox.cpp: Removed.
* Source/WebCore/rendering/LegacyInlineElementBox.h: Removed.
* Source/WebCore/rendering/LegacyInlineFlowBox.cpp:
(WebCore::LegacyInlineFlowBox::addToLine):
(WebCore::LegacyInlineFlowBox::placeBoxRangeInInlineDirection):
(WebCore::LegacyInlineFlowBox::requiresIdeographicBaseline const):
(WebCore::LegacyInlineFlowBox::adjustMaxAscentAndDescent):
(WebCore::LegacyInlineFlowBox::computeLogicalBoxHeights):
(WebCore::placeChildInlineBoxesInBlockDirection):
(WebCore::LegacyInlineFlowBox::flipLinesInBlockDirection):
(WebCore::LegacyInlineFlowBox::computeOverflow):
(WebCore::LegacyInlineFlowBox::computeOverAnnotationAdjustment const):
(WebCore::LegacyInlineFlowBox::computeUnderAnnotationAdjustment const):
* Source/WebCore/rendering/LegacyInlineTextBox.h:
(WebCore::LegacyInlineTextBox::LegacyInlineTextBox):
* Source/WebCore/rendering/LegacyLineLayout.cpp:
(WebCore::LegacyLineLayout::createInlineBoxForRenderer):
(WebCore::dirtyLineBoxesForRenderer):
(WebCore::LegacyLineLayout::constructLine):
(WebCore::setLogicalWidthForTextRun):
(WebCore::LegacyLineLayout::computeBlockDirectionPositionsForLine):
(WebCore::LegacyLineLayout::layoutLineBoxes):
* Source/WebCore/rendering/LegacyLineLayout.h:
* Source/WebCore/rendering/LegacyRootInlineBox.cpp:
(WebCore::LegacyRootInlineBox::ascentAndDescentForBox const):
(WebCore::LegacyRootInlineBox::verticalPositionForBox):
(WebCore::LegacyRootInlineBox::includeLeadingForBox const):
(WebCore::LegacyRootInlineBox::includeFontForBox const):
(WebCore::LegacyRootInlineBox::includeGlyphsForBox const):
(WebCore::LegacyRootInlineBox::includeInitialLetterForBox const):
(WebCore::LegacyRootInlineBox::includeMarginForBox const):
* Source/WebCore/rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::simplifiedNormalFlowLayout):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::createInlineBox): Deleted.
(WebCore::RenderBox::dirtyLineBoxes): Deleted.
(WebCore::RenderBox::positionLineBox): Deleted.
(WebCore::RenderBox::deleteLineBoxWrapper): Deleted.
* Source/WebCore/rendering/RenderBox.h:
(WebCore::RenderBox::inlineBoxWrapper const): Deleted.
(WebCore::RenderBox::setInlineBoxWrapper): Deleted.
* Source/WebCore/rendering/RenderFragmentedFlow.cpp:
(WebCore::RenderFragmentedFlow::computedFragmentRangeForBox const):
* Source/WebCore/rendering/RenderInline.cpp:
* Source/WebCore/rendering/RenderLineBoxList.cpp:
(WebCore::RenderLineBoxList::dirtyLinesFromChangedChild):
* Source/WebCore/rendering/RenderLineBreak.cpp:
(WebCore::RenderLineBreak::~RenderLineBreak):
(WebCore::RenderLineBreak::collectSelectionGeometries):
(WebCore::RenderLineBreak::createInlineBox): Deleted.
(WebCore::RenderLineBreak::setInlineBoxWrapper): Deleted.
(WebCore::RenderLineBreak::replaceInlineBoxWrapper): Deleted.
(WebCore::RenderLineBreak::deleteInlineBoxWrapper): Deleted.
(WebCore::RenderLineBreak::dirtyLineBoxes): Deleted.
* Source/WebCore/rendering/RenderLineBreak.h:
* Source/WebCore/rendering/RenderListItem.cpp:
(WebCore::RenderListItem::addOverflowFromChildren): Deleted.
* Source/WebCore/rendering/RenderListItem.h:
* Source/WebCore/rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::styleDidChange):
(WebCore::RenderListMarker::localSelectionRect):
(WebCore::RenderListMarker::selectionRectForRepaint):
(WebCore::RenderListMarker::createInlineBox): Deleted.
(WebCore::RenderListMarker::addOverflowFromListMarker): Deleted.
* Source/WebCore/rendering/RenderListMarker.h:
* Source/WebCore/rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::paint):
* Source/WebCore/rendering/RenderText.cpp:
(WebCore::RenderText::collectSelectionGeometries):
* Source/WebCore/rendering/updating/RenderTreeBuilder.cpp:
(WebCore::RenderTreeBuilder::detachFromRenderElement):

Canonical link: https://commits.webkit.org/276101@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