[webkit-changes] [WebKit/WebKit] 021fa3: [LFC][Cleanup] Remove Layout::Box::containingBlock

alan noreply at github.com
Wed Sep 21 07:42:53 PDT 2022


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 021fa34feec02ff6e819eeb1decf35f973c1ba9f
      https://github.com/WebKit/WebKit/commit/021fa34feec02ff6e819eeb1decf35f973c1ba9f
  Author: Alan Bujtas <zalan at apple.com>
  Date:   2022-09-21 (Wed, 21 Sep 2022)

  Changed paths:
    M Source/WebCore/layout/Verification.cpp
    M Source/WebCore/layout/floats/FloatingContext.cpp
    M Source/WebCore/layout/formattingContexts/FormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/FormattingContext.h
    M Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp
    M Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingQuirks.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp
    M Source/WebCore/layout/formattingContexts/block/PrecomputedBlockMarginCollapse.cpp
    M Source/WebCore/layout/layouttree/LayoutBox.cpp
    M Source/WebCore/layout/layouttree/LayoutBox.h
    M Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h

  Log Message:
  -----------
  [LFC][Cleanup] Remove Layout::Box::containingBlock
https://bugs.webkit.org/show_bug.cgi?id=245398

Reviewed by Antti Koivisto.

Let's not clutter Layout::Box interface with layout related functions. Move containingBlock() to FormattingContext.

* Source/WebCore/layout/Verification.cpp:
(WebCore::Layout::outputMismatchingBlockBoxInformationIfNeeded):
* Source/WebCore/layout/floats/FloatingContext.cpp:
(WebCore::Layout::FloatingContext::verticalPositionWithClearance const):
(WebCore::Layout::FloatingContext::absoluteCoordinates const):
(WebCore::Layout::FloatingContext::mapPointFromFormattingContextRootToFloatingStateRoot const):
* Source/WebCore/layout/formattingContexts/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::layoutOutOfFlowContent):
(WebCore::Layout::FormattingContext::containingBlock):
(WebCore::Layout::FormattingContext::formattingContextRoot):
(WebCore::Layout::FormattingContext::validateGeometryConstraintsAfterLayout const):
* Source/WebCore/layout/formattingContexts/FormattingContext.h:
* Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp:
(WebCore::Layout::isHeightAuto):
(WebCore::Layout::FormattingGeometry::staticVerticalPositionForOutOfFlowPositioned const):
(WebCore::Layout::FormattingGeometry::staticHorizontalPositionForOutOfFlowPositioned const):
(WebCore::Layout::FormattingGeometry::outOfFlowNonReplacedHorizontalGeometry const):
(WebCore::Layout::FormattingGeometry::outOfFlowReplacedHorizontalGeometry const):
(WebCore::Layout::FormattingGeometry::inFlowPositionedPositionOffset const):
(WebCore::Layout::usedWritingMode):
* Source/WebCore/layout/formattingContexts/FormattingQuirks.cpp:
(WebCore::Layout::FormattingQuirks::heightValueOfNearestContainingBlockWithFixedHeight const):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::layoutInFlowContent):
(WebCore::Layout::BlockFormattingContext::precomputeVerticalPositionForBoxAndAncestors):
(WebCore::Layout::BlockFormattingContext::verticalPositionWithMargin const):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp:
(WebCore::Layout::BlockFormattingGeometry::inFlowNonReplacedContentWidthAndMargin const):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingQuirks.cpp:
(WebCore::Layout::BlockFormattingQuirks::shouldCollapseMarginBeforeWithParentMarginBefore):
(WebCore::Layout::BlockFormattingQuirks::shouldCollapseMarginAfterWithParentMarginAfter):
* Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp:
(WebCore::Layout::BlockMarginCollapse::marginBeforeCollapsesWithParentMarginAfter const):
(WebCore::Layout::BlockMarginCollapse::marginBeforeCollapsesWithParentMarginBefore const):
(WebCore::Layout::BlockMarginCollapse::marginAfterCollapsesWithParentMarginBefore const):
(WebCore::Layout::BlockMarginCollapse::marginAfterCollapsesWithParentMarginAfter const):
* Source/WebCore/layout/formattingContexts/block/PrecomputedBlockMarginCollapse.cpp:
(WebCore::Layout::BlockMarginCollapse::precomputedPositiveNegativeValues const):
* Source/WebCore/layout/layouttree/LayoutBox.cpp:
(WebCore::Layout::Box::isOverflowVisible const):
(WebCore::Layout::Box::containingBlock const): Deleted.
* Source/WebCore/layout/layouttree/LayoutBox.h:
* Source/WebCore/layout/layouttree/LayoutContainingBlockChainIterator.h:
(WebCore::Layout::LayoutContainingBlockChainIterator::operator++):
(WebCore::Layout::containingBlockChain):

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




More information about the webkit-changes mailing list