[webkit-changes] [WebKit/WebKit] 762de6: [IFC] Replace containingBlock() with formattingCon...

alan noreply at github.com
Sun Sep 18 07:56:27 PDT 2022


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 762de66f4784b558929d769b76e810175347f9b4
      https://github.com/WebKit/WebKit/commit/762de66f4784b558929d769b76e810175347f9b4
  Author: Alan Bujtas <zalan at apple.com>
  Date:   2022-09-18 (Sun, 18 Sep 2022)

  Changed paths:
    M Source/WebCore/editing/VisiblePosition.cpp
    M Source/WebCore/editing/VisibleUnits.cpp
    M Source/WebCore/layout/integration/inline/InlineIteratorBox.cpp
    M Source/WebCore/layout/integration/inline/InlineIteratorBox.h
    M Source/WebCore/layout/integration/inline/InlineIteratorBoxLegacyPath.h
    M Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h
    M Source/WebCore/layout/integration/inline/InlineIteratorLineBox.cpp
    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/layout/integration/inline/InlineIteratorLogicalOrderTraversal.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.h
    M Source/WebCore/layout/integration/inline/LineSelection.h
    M Source/WebCore/rendering/CaretRectComputation.cpp
    M Source/WebCore/rendering/EllipsisBoxPainter.cpp
    M Source/WebCore/rendering/TextBoxPainter.cpp

  Log Message:
  -----------
  [IFC] Replace containingBlock() with formattingContextRoot()
https://bugs.webkit.org/show_bug.cgi?id=245323

Reviewed by Antti Koivisto.

What containingBlock() returns is the inline formatting context root.

* Source/WebCore/editing/VisiblePosition.cpp:
(WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):
* Source/WebCore/editing/VisibleUnits.cpp:
(WebCore::absoluteLineDirectionPointToLocalPointInBlock):
* Source/WebCore/layout/integration/inline/InlineIteratorBox.cpp:
(WebCore::InlineIterator::Box::visualRect const):
* Source/WebCore/layout/integration/inline/InlineIteratorBox.h:
(WebCore::InlineIterator::Box::formattingContextRoot const):
(WebCore::InlineIterator::Box::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorBoxLegacyPath.h:
(WebCore::InlineIterator::BoxLegacyPath::formattingContextRoot const):
(WebCore::InlineIterator::BoxLegacyPath::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorBoxModernPath.h:
(WebCore::InlineIterator::BoxModernPath::formattingContextRoot const):
(WebCore::InlineIterator::BoxModernPath::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLineBox.cpp:
(WebCore::InlineIterator::LineBox::ellipsisSelectionState const):
* Source/WebCore/layout/integration/inline/InlineIteratorLineBox.h:
(WebCore::InlineIterator::LineBox::style const):
(WebCore::InlineIterator::previousLineBoxContentBottomOrBorderAndPadding):
(WebCore::InlineIterator::contentStartInBlockDirection):
(WebCore::InlineIterator::LineBox::ellipsisVisualRect const):
(WebCore::InlineIterator::LineBox::formattingContextRoot const):
(WebCore::InlineIterator::LineBox::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxLegacyPath.h:
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::formattingContextRoot const):
(WebCore::InlineIterator::LineBoxIteratorLegacyPath::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLineBoxModernPath.h:
(WebCore::InlineIterator::LineBoxIteratorModernPath::formattingContextRoot const):
(WebCore::InlineIterator::LineBoxIteratorModernPath::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/InlineIteratorLogicalOrderTraversal.h:
(WebCore::InlineIterator::leafBoxesInLogicalOrder):
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.cpp:
(WebCore::LayoutIntegration::InlineContent::formattingContextRoot const):
(WebCore::LayoutIntegration::InlineContent::containingBlock const): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContent.h:
* Source/WebCore/layout/integration/inline/LineSelection.h:
(WebCore::LineSelection::physicalRect):
(WebCore::LineSelection::logicalTopAdjustedForPrecedingBlock):
(WebCore::LineSelection::selectionState):
* Source/WebCore/rendering/CaretRectComputation.cpp:
(WebCore::computeCaretRectForLinePosition):
* Source/WebCore/rendering/EllipsisBoxPainter.cpp:
(WebCore::EllipsisBoxPainter::paintSelection):
* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::TextBoxPainter<TextBoxPath>::computePaintRect):

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




More information about the webkit-changes mailing list