Changeset 293297 in webkit

Timestamp:

Apr 23, 2022 4:03:32 PM (2 years ago)

Author:

Alan Bujtas

Message:

[FFC][Integration] Add integration API to FlexFormattingContext
​https://bugs.webkit.org/show_bug.cgi?id=239692

Reviewed by Antti Koivisto.

The integration codepath needs dedicated (and temporary)APIs on the formatting contexts.
(This is exactly how inline layout has been integrated.)

• layout/formattingContexts/flex/FlexFormattingContext.cpp:

(WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntergration):
(WebCore::Layout::FlexFormattingContext::computedIntrinsicWidthConstraintsForIntegration):

• layout/formattingContexts/flex/FlexFormattingContext.h:
• layout/formattingContexts/inline/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntergration):
(WebCore::Layout::InlineFormattingContext::lineLayoutForIntergration): Deleted.

• layout/formattingContexts/inline/InlineFormattingContext.h:
• layout/integration/flex/LayoutIntegrationFlexLayout.cpp:

(WebCore::LayoutIntegration::FlexLayout::FlexLayout):
(WebCore::LayoutIntegration::FlexLayout::computeIntrinsicWidthConstraints):
(WebCore::LayoutIntegration::FlexLayout::layout):

• layout/integration/flex/LayoutIntegrationFlexLayout.h:

(WebCore::LayoutIntegration::FlexLayout::rootLayoutBox const):
(WebCore::LayoutIntegration::FlexLayout::rootLayoutBox):

• layout/integration/inline/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (1 diff)
• layout/formattingContexts/flex/FlexFormattingContext.h (modified) (1 diff)
• layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (1 diff)
• layout/formattingContexts/inline/InlineFormattingContext.h (modified) (1 diff)
• layout/integration/flex/LayoutIntegrationFlexLayout.cpp (modified) (3 diffs)
• layout/integration/flex/LayoutIntegrationFlexLayout.h (modified) (2 diffs)
• layout/integration/inline/LayoutIntegrationLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-23  Alan Bujtas  <zalan@apple.com>
+
+        [FFC][Integration] Add integration API to FlexFormattingContext
+        https://bugs.webkit.org/show_bug.cgi?id=239692
+
+        Reviewed by Antti Koivisto.
+
+        The integration codepath needs dedicated (and temporary)APIs on the formatting contexts.
+        (This is exactly how inline layout has been integrated.)
+
+        * layout/formattingContexts/flex/FlexFormattingContext.cpp:
+        (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntergration):
+        (WebCore::Layout::FlexFormattingContext::computedIntrinsicWidthConstraintsForIntegration):
+        * layout/formattingContexts/flex/FlexFormattingContext.h:
+        * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntergration):
+        (WebCore::Layout::InlineFormattingContext::lineLayoutForIntergration): Deleted.
+        * layout/formattingContexts/inline/InlineFormattingContext.h:
+        * layout/integration/flex/LayoutIntegrationFlexLayout.cpp:
+        (WebCore::LayoutIntegration::FlexLayout::FlexLayout):
+        (WebCore::LayoutIntegration::FlexLayout::computeIntrinsicWidthConstraints):
+        (WebCore::LayoutIntegration::FlexLayout::layout):
+        * layout/integration/flex/LayoutIntegrationFlexLayout.h:
+        (WebCore::LayoutIntegration::FlexLayout::rootLayoutBox const):
+        (WebCore::LayoutIntegration::FlexLayout::rootLayoutBox):
+        * layout/integration/inline/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::layout):
+
 2022-04-23  Brady Eidson  <beidson@apple.com>
 

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

@@ -119 +119 @@
 }
 
+void FlexFormattingContext::layoutInFlowContentForIntergration(const ConstraintsForInFlowContent&)
+{
+}
+
+IntrinsicWidthConstraints FlexFormattingContext::computedIntrinsicWidthConstraintsForIntegration()
+{
+    return { };
+}
+
 }
 }

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

@@ -43 +43 @@
     FlexFormattingContext(const ContainerBox& formattingContextRoot, FlexFormattingState&);
     void layoutInFlowContent(const ConstraintsForInFlowContent&) override;
+    IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
     LayoutUnit usedContentHeight() const override;
-
-    IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
 
     const FlexFormattingGeometry& formattingGeometry() const final { return m_flexFormattingGeometry; }
     const FormattingQuirks& formattingQuirks() const final { return m_flexFormattingQuirks; }
+
+    void layoutInFlowContentForIntergration(const ConstraintsForInFlowContent&);
+    IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration();
 
 private:

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

@@ -151 +151 @@
 }
 
-void InlineFormattingContext::lineLayoutForIntergration(const ConstraintsForInFlowContent& constraints)
+void InlineFormattingContext::layoutInFlowContentForIntergration(const ConstraintsForInFlowContent& constraints)
 {
     invalidateFormattingState();

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

@@ -48 +48 @@
 public:
     InlineFormattingContext(const ContainerBox& formattingContextRoot, InlineFormattingState&, const InlineDamage* = nullptr);
+
     void layoutInFlowContent(const ConstraintsForInFlowContent&) override;
+    IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
     LayoutUnit usedContentHeight() const override;
 
     const InlineFormattingState& formattingState() const { return downcast<InlineFormattingState>(FormattingContext::formattingState()); }
     InlineFormattingState& formattingState() { return downcast<InlineFormattingState>(FormattingContext::formattingState()); }
-
-    void lineLayoutForIntergration(const ConstraintsForInFlowContent&);
-    IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration();
-
     const InlineFormattingGeometry& formattingGeometry() const final { return m_inlineFormattingGeometry; }
     const InlineFormattingQuirks& formattingQuirks() const final { return m_inlineFormattingQuirks; }
 
-    IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
+    void layoutInFlowContentForIntergration(const ConstraintsForInFlowContent&);
+    IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration();
 
 private:

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

@@ -29 +29 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#include "FlexFormattingContext.h"
 #include "HitTestLocation.h"
 #include "HitTestRequest.h"
@@ -40 +41 @@
 FlexLayout::FlexLayout(RenderFlexibleBox& flexBoxRenderer)
     : m_boxTree(flexBoxRenderer)
-    , m_layoutState(flexBoxRenderer.document(), m_boxTree.rootLayoutBox())
+    , m_layoutState(flexBoxRenderer.document(), rootLayoutBox())
+    , m_flexFormattingState(m_layoutState.ensureFlexFormattingState(rootLayoutBox()))
 {
 }
@@ -66 +68 @@
 std::pair<LayoutUnit, LayoutUnit> FlexLayout::computeIntrinsicWidthConstraints()
 {
-    return { };
+    auto flexFormattingContext = Layout::FlexFormattingContext { rootLayoutBox(), m_flexFormattingState };
+    auto constraints = flexFormattingContext.computedIntrinsicWidthConstraintsForIntegration();
+
+    return { constraints.minimum, constraints.maximum };
 }
 
 void FlexLayout::layout()
 {
+    auto& rootGeometry = m_layoutState.geometryForBox(rootLayoutBox());
+    auto flexFormattingContext = Layout::FlexFormattingContext { rootLayoutBox(), m_flexFormattingState };
+    auto horizontalConstraints = Layout::HorizontalConstraints { rootGeometry.contentBoxLeft(), rootGeometry.contentBoxWidth() };
+
+    flexFormattingContext.layoutInFlowContentForIntergration({ horizontalConstraints, rootGeometry.contentBoxTop() });
 }
 

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

@@ -28 +28 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#include "FlexFormattingState.h"
 #include "LayoutIntegrationBoxTree.h"
 #include "LayoutState.h"
@@ -64 +65 @@
 
 private:
+    const Layout::ContainerBox& rootLayoutBox() const { return m_boxTree.rootLayoutBox(); }
+    Layout::ContainerBox& rootLayoutBox() { return m_boxTree.rootLayoutBox(); }
+
     BoxTree m_boxTree;
     Layout::LayoutState m_layoutState;
+    Layout::FlexFormattingState& m_flexFormattingState;
 };
 

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

@@ -381 +381 @@
     auto horizontalConstraints = Layout::HorizontalConstraints { rootGeometry.contentBoxLeft(), rootGeometry.contentBoxWidth() };
 
-    inlineFormattingContext.lineLayoutForIntergration({ horizontalConstraints, rootGeometry.contentBoxTop() });
+    inlineFormattingContext.layoutInFlowContentForIntergration({ horizontalConstraints, rootGeometry.contentBoxTop() });
 
     constructContent();