[webkit-changes] [WebKit/WebKit] 518d8d: [LFC][IFC] Introduce ConstraintsForInlineContent

Alan Baradlay noreply at github.com
Sun Nov 6 07:40:35 PST 2022


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 518d8d287c12dbe6fdf6f5cfd9ec910598cac922
      https://github.com/WebKit/WebKit/commit/518d8d287c12dbe6fdf6f5cfd9ec910598cac922
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2022-11-06 (Sun, 06 Nov 2022)

  Changed paths:
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/layout/formattingContexts/FormattingConstraints.h
    M Source/WebCore/layout/formattingContexts/flex/FlexFormattingConstraints.h
    A Source/WebCore/layout/formattingContexts/inline/InlineFormattingConstraints.h
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h
    M Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp
    M Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.h
    M Source/WebCore/layout/formattingContexts/table/TableFormattingConstraints.h
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
    M Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h

  Log Message:
  -----------
  [LFC][IFC] Introduce ConstraintsForInlineContent
https://bugs.webkit.org/show_bug.cgi?id=247535

Reviewed by Antti Koivisto.

This is similar to what we already do for flex/table content where base constraints are not sufficient.

* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/layout/formattingContexts/FormattingConstraints.h: Move visualLeft from base class to ConstraintsForInlineContent.
(WebCore::Layout::ConstraintsForInFlowContent::logicalTop const):
(WebCore::Layout::ConstraintsForInFlowContent::isConstraintsForInlineContent const):
(WebCore::Layout::ConstraintsForInFlowContent::ConstraintsForInFlowContent):
(WebCore::Layout::ConstraintsForInFlowContent::visualLeft const): Deleted.
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingConstraints.h:
(WebCore::Layout::ConstraintsForFlexContent::ConstraintsForFlexContent):
(WebCore::Layout::m_minimumVerticalSpace): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingConstraints.h: Copied from Source/WebCore/layout/formattingContexts/table/TableFormattingConstraints.h.
(WebCore::Layout::ConstraintsForInlineContent::visualLeft const):
(WebCore::Layout::ConstraintsForInlineContent::ConstraintsForInlineContent):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layoutInFlowContent):
(WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntegration):
(WebCore::Layout::InlineFormattingContext::lineLayout):
(WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h:
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.cpp:
(WebCore::Layout::InlineDisplayLineBuilder::build const):
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayLineBuilder.h:
* Source/WebCore/layout/formattingContexts/table/TableFormattingConstraints.h:
(WebCore::Layout::ConstraintsForTableContent::ConstraintsForTableContent):
(WebCore::Layout::m_availableVerticalSpaceForContent): Deleted.
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::updateInlineContentConstraints):
* Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h:

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




More information about the webkit-changes mailing list