Changeset 294192 in webkit

Timestamp:

May 14, 2022 6:30:56 AM (2 years ago)

Author:

Alan Bujtas

Message:

[FFC][Integration] Do not reset the effective display value for flex root
​https://bugs.webkit.org/show_bug.cgi?id=240412

Reviewed by Antti Koivisto.

Non-inline formatting roots (e.g. flex) should not need display type adjustment.

• layout/integration/LayoutIntegrationBoxTree.cpp:

(WebCore::LayoutIntegration::rootBoxStyle):
(WebCore::LayoutIntegration::rootBoxFirstLineStyle):
(WebCore::LayoutIntegration::BoxTree::BoxTree):
(WebCore::LayoutIntegration::BoxTree::updateStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationBoxTree.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-14  Alan Bujtas  <zalan@apple.com>
+
+        [FFC][Integration] Do not reset the effective display value for flex root
+        https://bugs.webkit.org/show_bug.cgi?id=240412
+
+        Reviewed by Antti Koivisto.
+
+        Non-inline formatting roots (e.g. flex) should not need display type adjustment.
+
+        * layout/integration/LayoutIntegrationBoxTree.cpp:
+        (WebCore::LayoutIntegration::rootBoxStyle):
+        (WebCore::LayoutIntegration::rootBoxFirstLineStyle):
+        (WebCore::LayoutIntegration::BoxTree::BoxTree):
+        (WebCore::LayoutIntegration::BoxTree::updateStyle):
+
 2022-05-14  Alan Bujtas  <zalan@apple.com>
 

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

@@ -58 +58 @@
 #define CAN_USE_FIRST_LINE_STYLE_RESOLVE 1
 
-static RenderStyle rootBoxStyle(const RenderStyle& style)
-{
-    auto clonedStyle = RenderStyle::clone(style);
-    clonedStyle.setEffectiveDisplay(DisplayType::Block);
+static RenderStyle rootBoxStyle(const RenderBlock& rootRenderer)
+{
+    auto clonedStyle = RenderStyle::clone(rootRenderer.style());
+    if (is<RenderBlockFlow>(rootRenderer))
+        clonedStyle.setEffectiveDisplay(DisplayType::Block);
     return clonedStyle;
 }
@@ -72 +73 @@
         return { };
     auto clonedStyle = RenderStyle::clonePtr(firstLineStyle);
-    clonedStyle->setEffectiveDisplay(DisplayType::Block);
+    if (is<RenderBlockFlow>(rootRenderer))
+        clonedStyle->setEffectiveDisplay(DisplayType::Block);
     return clonedStyle;
 #else
@@ -82 +84 @@
 BoxTree::BoxTree(RenderBlock& rootRenderer)
     : m_rootRenderer(rootRenderer)
-    , m_root(Layout::Box::ElementAttributes { Layout::Box::ElementType::IntegrationBlockContainer }, rootBoxStyle(rootRenderer.style()), rootBoxFirstLineStyle(rootRenderer))
+    , m_root(Layout::Box::ElementAttributes { Layout::Box::ElementType::IntegrationBlockContainer }, rootBoxStyle(rootRenderer), rootBoxFirstLineStyle(rootRenderer))
 {
     if (rootRenderer.isAnonymous())
@@ -218 +220 @@
 
     if (&layoutBox == &rootLayoutBox())
-        layoutBox.updateStyle(rootBoxStyle(style), rootBoxFirstLineStyle(downcast<RenderBlockFlow>(renderer)));
+        layoutBox.updateStyle(rootBoxStyle(downcast<RenderBlock>(renderer)), rootBoxFirstLineStyle(downcast<RenderBlock>(renderer)));
     else
         layoutBox.updateStyle(style, firstLineStyle());