Changeset 295283 in webkit

Timestamp:

Jun 6, 2022 6:11:21 AM (2 years ago)

Author:

Alan Bujtas

Message:

Implement FlexFormattingContext::usedContentHeight
​https://bugs.webkit.org/show_bug.cgi?id=241325

Reviewed by Antti Koivisto.

Update the RenderFlexibleBox's content height.

• Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp:

(WebCore::Layout::FlexFormattingContext::usedContentHeight const):

• Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp:

(WebCore::LayoutIntegration::FlexLayout::contentLogicalHeight const):

• Source/WebCore/rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutUsingFlexFormattingContext):

Canonical link: ​https://commits.webkit.org/251329@main

Location:

trunk/Source/WebCore

Files:

• layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (1 diff)
• layout/integration/flex/LayoutIntegrationFlexLayout.cpp (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp

@@ -58 +58 @@
 LayoutUnit FlexFormattingContext::usedContentHeight() const
 {
-    auto& lines = formattingState().lines();
-    return LayoutUnit { lines.last().bottom() - lines.first().top() };
+    auto contentTop = LayoutUnit::max();
+    auto contentBottom = LayoutUnit::min();
+    for (auto& flexItem : childrenOfType<Box>(root())) {
+        auto marginBox = Layout::BoxGeometry::marginBoxRect(geometryForBox(flexItem));
+        contentTop = std::min(contentTop, marginBox.top());
+        contentBottom = std::max(contentBottom, marginBox.bottom());
+    }
+    return std::max(0_lu, contentBottom - contentTop);
 }
 

trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp

@@ -172 +172 @@
 LayoutUnit FlexLayout::contentLogicalHeight() const
 {
-    return { };
+    return Layout::FlexFormattingContext { rootLayoutBox(), m_flexFormattingState }.usedContentHeight();
 }
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -2367 +2367 @@
     }
     m_flexLayout->layout();
+    setLogicalHeight(std::max(logicalHeight(), borderBefore() + paddingBefore() + m_flexLayout->contentLogicalHeight() + borderAfter() + paddingAfter()));
+    updateLogicalHeight();
 }
 #endif