Changeset 286096 in webkit

Timestamp:

Nov 20, 2021, 6:43:28 AM (5 years ago)

Author:

Alan Bujtas

Message:

[IFC][Integration] Initialize layout box geometries for preferred width computation
​https://bugs.webkit.org/show_bug.cgi?id=233386

Reviewed by Antti Koivisto.

Initializing certain geometries (e.g. inline box margin/border/padding) is required for the integration
codepath the same way we do it for the actual line layout.

• layout/formattingContexts/inline/InlineFormattingContext.cpp: Add a dedicated integration codepath for preferred width

computation using the preset geometry values.
(WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraintsForIntegration):

• layout/formattingContexts/inline/InlineFormattingContext.h:
• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::tryComputePreferredWidthsUsingModernPath):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (1 diff)
• layout/formattingContexts/inline/InlineFormattingContext.h (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-20  Alan Bujtas  <zalan@apple.com>
+
+        [IFC][Integration] Initialize layout box geometries for preferred width computation
+        https://bugs.webkit.org/show_bug.cgi?id=233386
+
+        Reviewed by Antti Koivisto.
+
+        Initializing certain geometries (e.g. inline box margin/border/padding) is required for the integration
+        codepath the same way we do it for the actual line layout.
+
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp: Add a dedicated integration codepath for preferred width
+        computation using the preset geometry values.
+        (WebCore::Layout::InlineFormattingContext::computedIntrinsicWidthConstraintsForIntegration):
+        * layout/formattingContexts/inline/InlineFormattingContext.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::tryComputePreferredWidthsUsingModernPath):
+
 2021-11-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp

@@ -158 +158 @@
 }
 
+IntrinsicWidthConstraints InlineFormattingContext::computedIntrinsicWidthConstraintsForIntegration()
+{
+    if (formattingState().intrinsicWidthConstraints())
+        return *formattingState().intrinsicWidthConstraints();
+
+    collectContentIfNeeded();
+
+    auto constraints = formattingGeometry().constrainByMinMaxWidth(root(),
+        { ceiledLayoutUnit(computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Minimum))
+        , ceiledLayoutUnit(computedIntrinsicWidthForConstraint(IntrinsicWidthMode::Maximum)) });
+    formattingState().setIntrinsicWidthConstraints(constraints);
+    return constraints;
+}
+
 LayoutUnit InlineFormattingContext::usedContentHeight() const
 {

trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h

@@ -55 +55 @@
 
     void lineLayoutForIntergration(const ConstraintsForInFlowContent&);
+    IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration();
 
     const InlineFormattingGeometry& formattingGeometry() const final { return m_inlineFormattingGeometry; }

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -221 +221 @@
 {
     auto inlineFormattingContext = Layout::InlineFormattingContext { rootLayoutBox(), m_inlineFormattingState, nullptr };
-    auto constraints = inlineFormattingContext.computedIntrinsicWidthConstraints();
+    auto constraints = inlineFormattingContext.computedIntrinsicWidthConstraintsForIntegration();
 
     return { constraints.minimum, constraints.maximum };

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -4581 +4581 @@
         m_lineLayout = makeUnique<LayoutIntegration::LineLayout>(*this);
 
+#if ENABLE_MODERN_PREFERRED_WIDTH_COMPUTATION_FOR_INLINE_BOXES
+    auto& layoutFormattingContextLineLayout = *this->modernLineLayout();
+    for (auto walker = InlineWalker(*this); !walker.atEnd(); walker.advance()) {
+        auto& renderer = *walker.current();
+        if (renderer.isText() || is<RenderLineBreak>(renderer))
+            continue;
+        if (is<RenderInline>(renderer)) {
+            layoutFormattingContextLineLayout.updateInlineBoxDimensions(downcast<RenderInline>(renderer));
+            continue;
+        }
+        // FIXME: Add other, inline level box cases.
+        ASSERT_NOT_IMPLEMENTED_YET();
+    }
+#endif
+
     std::tie(minLogicalWidth, maxLogicalWidth) = modernLineLayout()->computeIntrinsicWidthConstraints();
     for (auto walker = InlineWalker(*this); !walker.atEnd(); walker.advance())