[webkit-changes] [WebKit/WebKit] 4d9fd5: [IFC][Partial layout] InlineFormattingContext::lay...

[Alan Baradlay]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 4d9fd53535287ac410e6ddf7635bff97986c96dd
      https://github.com/WebKit/WebKit/commit/4d9fd53535287ac410e6ddf7635bff97986c96dd
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-03-08 (Wed, 08 Mar 2023)

  Changed paths:
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h
    M Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContent.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h

  Log Message:
  -----------
  [IFC][Partial layout] InlineFormattingContext::layout should return display content
https://bugs.webkit.org/show_bug.cgi?id=253483

Reviewed by Antti Koivisto.

Instead of layoutInFlowContentForIntegration consulting m_inlineFormattingState for display content, InlineFormattingContext::layout should return it.
This is in preparation for removing display content from InlineFormattingState.

* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntegration):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h:
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContent.h:
(WebCore::InlineDisplay::Content::set):
(WebCore::InlineDisplay::Content::append):
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.cpp:
(WebCore::LayoutIntegration::InlineContentBuilder::build const):
* Source/WebCore/layout/integration/inline/LayoutIntegrationInlineContentBuilder.h:
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::layout):
(WebCore::LayoutIntegration::LineLayout::constructContent):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:

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