[webkit-changes] [WebKit/WebKit] 7dd08f: [LFC][Integration] Add support for calling min/max...

[Alan Baradlay]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 7dd08f57f28be6083c6b836bd26172c49d3cdb36
      https://github.com/WebKit/WebKit/commit/7dd08f57f28be6083c6b836bd26172c49d3cdb36
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2024-08-26 (Mon, 26 Aug 2024)

  Changed paths:
    M Source/WebCore/Sources.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    M Source/WebCore/layout/LayoutState.cpp
    M Source/WebCore/layout/LayoutState.h
    M Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h
    M Source/WebCore/layout/formattingContexts/flex/FlexLayout.cpp
    M Source/WebCore/layout/formattingContexts/flex/FlexLayout.h
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.h
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.h
    M Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp
    M Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp
    M Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp
    M Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.h
    A Source/WebCore/layout/integration/LayoutIntegrationUtils.cpp
    A Source/WebCore/layout/integration/LayoutIntegrationUtils.h
    M Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp
    M Source/WebCore/rendering/RenderView.cpp

  Log Message:
  -----------
  [LFC][Integration] Add support for calling min/maxPreferredLogicalWidth from inside LFC
https://bugs.webkit.org/show_bug.cgi?id=278612

Reviewed by Antti Koivisto.

It's essential for flex layout to be able to call min/max content widths on flex items.

(Move integration functions to a dedicated util class (while having one "utility" function is fine on the formatting context class, now with min/max, it may be a bit confusing to see seemingly duplicated functionality -where FormattingContext has layout/min/max for its own subtree))

* Source/WebCore/layout/LayoutState.cpp:
(WebCore::Layout::LayoutState::LayoutState):
(WebCore::Layout::LayoutState::layoutWithFormattingContextForBox const):
(WebCore::Layout::LayoutState::preferredWidthWithFormattingContextForBox const):
(WebCore::Layout::LayoutState::layoutWithFormattingContextForBox): Deleted.
* Source/WebCore/layout/LayoutState.h:
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingUtils.cpp:
(WebCore::Layout::FlexFormattingUtils::FlexFormattingUtils):
(WebCore::Layout::FlexFormattingUtils::layoutWithFormattingContextForBox const):
(WebCore::Layout::FlexFormattingUtils::preferredWidthWithFormattingContextForBox const):
* Source/WebCore/layout/formattingContexts/flex/FlexFormattingUtils.h:
(WebCore::Layout::FlexFormattingUtils::layoutWithFormattingContextForBox):
* Source/WebCore/layout/formattingContexts/flex/LogicalFlexItem.h:
(WebCore::Layout::LogicalFlexItem::mainAxis):
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::InlineFormattingContext):
(WebCore::Layout::InlineFormattingContext::layoutFloatContentOnly):
(WebCore::Layout::InlineFormattingContext::initializeInlineLayoutState):
(WebCore::Layout::InlineFormattingContext::layoutWithFormattingContextForBox): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h:
(WebCore::Layout::InlineFormattingContext::layoutWithFormattingContextForBox): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.cpp:
(WebCore::Layout::InlineFormattingUtils::InlineFormattingUtils):
(WebCore::Layout::InlineFormattingUtils::inlineLevelBoxAffectsLineBox const):
(WebCore::Layout::InlineFormattingUtils::initialLineHeight const):
(WebCore::Layout::InlineFormattingUtils::layoutWithFormattingContextForBox const):
(WebCore::Layout::InlineFormattingUtils::preferredWidthWithFormattingContextForBox const):
(WebCore::Layout::InlineFormattingUtils::layoutState const): Deleted.
* Source/WebCore/layout/formattingContexts/inline/InlineFormattingUtils.h:
(WebCore::Layout::InlineFormattingUtils::layoutWithFormattingContextForBox):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp:
(WebCore::Layout::LineBoxVerticalAligner::LineBoxVerticalAligner):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.h:
(WebCore::Layout::LineBoxVerticalAligner::formattingUtils const):
* Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::candidateContentForLine):
* Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp:
(WebCore::Layout::RubyFormattingContext::annotationBoxLogicalWidth):
(WebCore::Layout::RubyFormattingContext::applyRubyAlignOnBaseContent):
(WebCore::Layout::RubyFormattingContext::sizeAnnotationBox):
* Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.cpp:
(WebCore::LayoutIntegration::preferredLogicalWidths):
* Source/WebCore/layout/integration/LayoutIntegrationFormattingContextLayout.h:
* Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::printLayoutTreeForLiveDocuments):
* Source/WebCore/rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):

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



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications