[webkit-changes] [WebKit/WebKit] 944c48: [IFC] Remove inline display content from InlineFor...

[Alan Baradlay]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 944c48e46b9c93ce8adbe2cd47793d0c75ec7514
      https://github.com/WebKit/WebKit/commit/944c48e46b9c93ce8adbe2cd47793d0c75ec7514
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-04-28 (Fri, 28 Apr 2023)

  Changed paths:
    M LayoutTests/TestExpectations
    M LayoutTests/platform/mac-wk1/TestExpectations
    M LayoutTests/platform/mac-wk2/TestExpectations
    M Source/WebCore/display/DisplayTreeBuilder.cpp
    M Source/WebCore/display/DisplayTreeBuilder.h
    M Source/WebCore/layout/Verification.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp
    M Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingState.h
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp
    M Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp
    M Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp

  Log Message:
  -----------
  [IFC] Remove inline display content from InlineFormattingState
https://bugs.webkit.org/show_bug.cgi?id=256094

Reviewed by Antti Koivisto.

This change breaks "full LFC" with inline content (integration codepath does not use InlineFormattingState to collect inline display content), but
full LFC is mostly broken anyway. FCs are going to be integrated on case by case and "full LFC" essentially turns into the final stage of BFC integration.

* LayoutTests/TestExpectations:
* LayoutTests/platform/mac-wk1/TestExpectations:
* LayoutTests/platform/mac-wk2/TestExpectations:
* Source/WebCore/display/DisplayTreeBuilder.cpp:
(WebCore::Display::TreeBuilder::buildInlineDisplayTree):
* Source/WebCore/display/DisplayTreeBuilder.h:
(WebCore::Display::TreeBuilder::lines const):
(WebCore::Display::TreeBuilder::boxes const):
* Source/WebCore/layout/Verification.cpp:
(WebCore::Layout::outputMismatchingComplexLineInformationIfNeeded):
* Source/WebCore/layout/formattingContexts/block/BlockFormattingGeometry.cpp:
(WebCore::Layout::BlockFormattingGeometry::inFlowNonReplacedContentHeightAndMargin const):
* Source/WebCore/layout/formattingContexts/block/BlockMarginCollapse.cpp:
(WebCore::Layout::BlockMarginCollapse::marginsCollapseThrough const):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
(WebCore::Layout::InlineFormattingContext::usedContentHeight const):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingState.h:
(WebCore::Layout::InlineFormattingState::shrinkToFit):
(WebCore::Layout::InlineFormattingState::lines const): Deleted.
(WebCore::Layout::InlineFormattingState::lines): Deleted.
(WebCore::Layout::InlineFormattingState::boxes const): Deleted.
(WebCore::Layout::InlineFormattingState::boxes): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxBuilder.cpp:
(WebCore::Layout::LineBoxBuilder::setVerticalPropertiesForInlineLevelBox const):
* Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp:
(WebCore::Layout::TableFormattingContext::setUsedGeometryForCells):
* Source/WebCore/layout/formattingContexts/table/TableFormattingGeometry.cpp:
(WebCore::Layout::TableFormattingGeometry::usedBaselineForCell const):
* Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::showInlineTreeAndRuns):

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