Changeset 294193 in webkit

Timestamp:

May 14, 2022 6:59:52 AM (2 years ago)

Author:

Alan Bujtas

Message:

[FFC][Integration] Add updateFormattingRootGeometryAndInvalidate/updateRenderers
​https://bugs.webkit.org/show_bug.cgi?id=240413

Reviewed by Antti Koivisto.

Make sure that the layout box/renderer geometries are all up-to-date.

• layout/integration/flex/LayoutIntegrationFlexLayout.cpp:

(WebCore::LayoutIntegration::logicalBorder):
(WebCore::LayoutIntegration::logicalPadding):
(WebCore::LayoutIntegration::FlexLayout::updateFormattingRootGeometryAndInvalidate):
(WebCore::LayoutIntegration::FlexLayout::layout):
(WebCore::LayoutIntegration::FlexLayout::updateRenderers const):

• layout/integration/flex/LayoutIntegrationFlexLayout.h:

(WebCore::LayoutIntegration::FlexLayout::flexBoxRenderer const):
(WebCore::LayoutIntegration::FlexLayout::flexBoxRenderer):

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutUsingFlexFormattingContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/flex/LayoutIntegrationFlexLayout.cpp (modified) (2 diffs)
• layout/integration/flex/LayoutIntegrationFlexLayout.h (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-14  Alan Bujtas  <zalan@apple.com>
+
+        [FFC][Integration] Add updateFormattingRootGeometryAndInvalidate/updateRenderers
+        https://bugs.webkit.org/show_bug.cgi?id=240413
+
+        Reviewed by Antti Koivisto.
+
+        Make sure that the layout box/renderer geometries are all up-to-date.
+
+        * layout/integration/flex/LayoutIntegrationFlexLayout.cpp:
+        (WebCore::LayoutIntegration::logicalBorder):
+        (WebCore::LayoutIntegration::logicalPadding):
+        (WebCore::LayoutIntegration::FlexLayout::updateFormattingRootGeometryAndInvalidate):
+        (WebCore::LayoutIntegration::FlexLayout::layout):
+        (WebCore::LayoutIntegration::FlexLayout::updateRenderers const):
+        * layout/integration/flex/LayoutIntegrationFlexLayout.h:
+        (WebCore::LayoutIntegration::FlexLayout::flexBoxRenderer const):
+        (WebCore::LayoutIntegration::FlexLayout::flexBoxRenderer):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutUsingFlexFormattingContext):
+
 2022-05-14  Alan Bujtas  <zalan@apple.com>
 

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

@@ -46 +46 @@
 }
 
+// FIXME: Merge these with the other integration layout functions.
+static inline Layout::Edges logicalBorder(const RenderBoxModelObject& renderer, bool isLeftToRightInlineDirection, WritingMode writingMode)
+{
+    UNUSED_PARAM(isLeftToRightInlineDirection);
+    UNUSED_PARAM(writingMode);
+
+    auto borderLeft = renderer.borderLeft();
+    auto borderRight = renderer.borderRight();
+    auto borderTop = renderer.borderTop();
+    auto borderBottom = renderer.borderBottom();
+
+    return { { borderLeft, borderRight }, { borderTop, borderBottom } };
+}
+
+static inline Layout::Edges logicalPadding(const RenderBoxModelObject& renderer, bool isLeftToRightInlineDirection, WritingMode writingMode)
+{
+    UNUSED_PARAM(isLeftToRightInlineDirection);
+    UNUSED_PARAM(writingMode);
+
+    auto paddingLeft = renderer.paddingLeft();
+    auto paddingRight = renderer.paddingRight();
+    auto paddingTop = renderer.paddingTop();
+    auto paddingBottom = renderer.paddingBottom();
+
+    return { { paddingLeft, paddingRight }, { paddingTop, paddingBottom } };
+}
+
 void FlexLayout::updateFormattingRootGeometryAndInvalidate()
 {
+    auto& flexBoxRenderer = this->flexBoxRenderer();
+
+    auto updateGeometry = [&](auto& root) {
+        auto isLeftToRightInlineDirection = flexBoxRenderer.style().isLeftToRightDirection();
+        auto writingMode = flexBoxRenderer.style().writingMode();
+
+        root.setContentBoxWidth(writingMode == WritingMode::TopToBottom ? flexBoxRenderer.contentWidth() : flexBoxRenderer.contentHeight());
+        root.setPadding(logicalPadding(flexBoxRenderer, isLeftToRightInlineDirection, writingMode));
+        root.setBorder(logicalBorder(flexBoxRenderer, isLeftToRightInlineDirection, writingMode));
+        root.setHorizontalMargin({ });
+        root.setVerticalMargin({ });
+    };
+    return updateGeometry(m_layoutState.ensureGeometryForBox(rootLayoutBox()));
 }
 
@@ -81 +121 @@
 
     flexFormattingContext.layoutInFlowContentForIntegration({ horizontalConstraints, rootGeometry.contentBoxTop() });
+
+    updateRenderers();
+}
+
+void FlexLayout::updateRenderers() const
+{
+    auto& boxAndRendererList = m_boxTree.boxAndRendererList();
+    for (auto& boxAndRenderer : boxAndRendererList) {
+        auto& layoutBox = boxAndRenderer.box.get();
+
+        auto& renderer = downcast<RenderBox>(*boxAndRenderer.renderer);
+        renderer.setLocation(Layout::BoxGeometry::borderBoxTopLeft(m_flexFormattingState.boxGeometry(layoutBox)));
+    }
 }
 

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

@@ -65 +65 @@
 
 private:
+    void updateRenderers() const;
+
     const Layout::ContainerBox& rootLayoutBox() const { return m_boxTree.rootLayoutBox(); }
     Layout::ContainerBox& rootLayoutBox() { return m_boxTree.rootLayoutBox(); }
+
+    const RenderFlexibleBox& flexBoxRenderer() const { return downcast<RenderFlexibleBox>(m_boxTree.rootRenderer()); }
+    RenderFlexibleBox& flexBoxRenderer() { return downcast<RenderFlexibleBox>(m_boxTree.rootRenderer()); }
 
     BoxTree m_boxTree;

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -2348 +2348 @@
         m_flexLayout = makeUnique<LayoutIntegration::FlexLayout>(*this);
 
+    m_flexLayout->updateFormattingRootGeometryAndInvalidate();
+
     for (auto& flexItem : childrenOfType<RenderBlock>(*this)) {
         flexItem.layoutIfNeeded();