[webkit-changes] [WebKit/WebKit] 3facd6: [IFC][Cleanup] Cleanup FormattingState/InlineForma...

Alan Baradlay noreply at github.com
Sun Oct 1 19:32:07 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 3facd67e2518ff15efe1b6cda0810e4c76e9c482
      https://github.com/WebKit/WebKit/commit/3facd67e2518ff15efe1b6cda0810e4c76e9c482
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-10-01 (Sun, 01 Oct 2023)

  Changed paths:
    M Source/WebCore/layout/FormattingState.h
    M Source/WebCore/layout/LayoutContext.cpp
    M Source/WebCore/layout/Verification.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/block/BlockFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.h
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingState.h
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingState.h
    M Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp
    M Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h
    M Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

  Log Message:
  -----------
  [IFC][Cleanup] Cleanup FormattingState/InlineFormattingState class
https://bugs.webkit.org/show_bug.cgi?id=262443

Reviewed by Antti Koivisto.

This is in preparation for making InlineFormattingState a type of layout cache.

1. Move BFC specific functionality to BlockFormattingState/Context
2. Move intrinsic width caching to InlineFormattingState

* Source/WebCore/layout/FormattingState.h:
(WebCore::Layout::FormattingState::setIntrinsicWidthConstraints):
(WebCore::Layout::FormattingState::resetIntrinsicWidthConstraints): Deleted.
(WebCore::Layout::FormattingState::addOutOfFlowBox): Deleted.
(WebCore::Layout::FormattingState::setOutOfFlowBoxes): Deleted.
(WebCore::Layout::FormattingState::outOfFlowBoxes const): Deleted.
* Source/WebCore/layout/LayoutContext.cpp:
(WebCore::Layout::LayoutContext::layoutFormattingContextSubtree):
* Source/WebCore/layout/Verification.cpp:
* Source/WebCore/layout/formattingContexts/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry): Deleted.
(WebCore::Layout::FormattingContext::computeOutOfFlowVerticalGeometry): Deleted.
(WebCore::Layout::FormattingContext::layoutOutOfFlowContent): Deleted.
(WebCore::Layout::FormattingContext::collectOutOfFlowDescendantsIfNeeded): Deleted.
* Source/WebCore/layout/formattingContexts/FormattingContext.h:
(WebCore::Layout::FormattingContext::layoutInFlowContent):
* Source/WebCore/layout/formattingContexts/FormattingGeometry.cpp:
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::layoutInFlowContent):
(WebCore::Layout::BlockFormattingContext::layoutOutOfFlowContent):
(WebCore::Layout::BlockFormattingContext::computeOutOfFlowHorizontalGeometry):
(WebCore::Layout::BlockFormattingContext::computeOutOfFlowVerticalGeometry):
(WebCore::Layout::BlockFormattingContext::collectOutOfFlowDescendantsIfNeeded):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingContext.h:
* Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp:
* Source/WebCore/layout/formattingContexts/block/BlockFormattingState.h:
(WebCore::Layout::BlockFormattingState::addOutOfFlowBox):
(WebCore::Layout::BlockFormattingState::setOutOfFlowBoxes):
(WebCore::Layout::BlockFormattingState::outOfFlowBoxes const):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingState.h:
(WebCore::Layout::InlineFormattingState::setIntrinsicWidthConstraints):
(WebCore::Layout::InlineFormattingState::resetIntrinsicWidthConstraints):
(WebCore::Layout::InlineFormattingState::intrinsicWidthConstraints const):
* Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp:
* Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp:
* Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::shouldInvalidateLineLayoutPathAfterChangeFor):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::updateListMarkerDimensions):
(WebCore::LayoutIntegration::LineLayout::updateRenderTreePositions):
(WebCore::LayoutIntegration::LineLayout::enclosingBorderBoxRectFor const):
(WebCore::LayoutIntegration::LineLayout::hasOutOfFlowContent const): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:
(WebCore::LayoutIntegration::LineLayout::layoutState const):
* Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp:

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




More information about the webkit-changes mailing list