Changeset 287263 in webkit

Timestamp:

Dec 20, 2021 8:56:35 AM (7 months ago)

Author:

svillar@igalia.com

Message:

[css-flexbox] Pre-layout orthogonal children to compute the preferred logical width
​https://bugs.webkit.org/show_bug.cgi?id=234300

Reviewed by Javier Fernandez.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode-expected.txt: Replaced

FAIL by PASS expectations for 2 subtests that are passing now.

Source/WebCore:

In order to properly compute the flex container intrinsic width we must layout the orthogonal
children so that we could use the children's block sizes (which are in the flex container
inline axis).

The very same solution was adopted long time ago by the RenderGrid code.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths const): prelayout orthogonal children.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-12-14  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-flexbox] Pre-layout orthogonal children to compute the preferred logical width
+        https://bugs.webkit.org/show_bug.cgi?id=234300
+
+        Reviewed by Javier Fernandez.
+
+        * web-platform-tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode-expected.txt: Replaced
+        FAIL by PASS expectations for 2 subtests that are passing now.
+
 2021-12-16  Vitaly Dyachkov  <obyknovenius@me.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/intrinsic-width-orthogonal-writing-mode-expected.txt

@@ -1 +1 @@
 
 PASS .inline-flexbox 1
-FAIL .inline-flexbox 2 assert_equals:
-<div class="inline-flexbox" data-expected-width="20">
-    <div class="vertical" style="line-height: 20px;">Some text</div>
-</div>
-width expected 20 but got 0
-FAIL .inline-flexbox 3 assert_equals:
-<div class="inline-flexbox" data-expected-width="20">
-    <span class="vertical" data-expected-width="20" style="line-height: 20px;">Some text</span>
-</div>
-width expected 20 but got 0
+PASS .inline-flexbox 2
+PASS .inline-flexbox 3
 
 Some text

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-14  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-flexbox] Pre-layout orthogonal children to compute the preferred logical width
+        https://bugs.webkit.org/show_bug.cgi?id=234300
+
+        Reviewed by Javier Fernandez.
+
+        In order to properly compute the flex container intrinsic width we must layout the orthogonal
+        children so that we could use the children's block sizes (which are in the flex container
+        inline axis).
+
+        The very same solution was adopted long time ago by the RenderGrid code.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths const): prelayout orthogonal children.
+
 2021-12-20  Karl Dubost  <karl+github@la-grange.net>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -113 +113 @@
             continue;
         ++numItemsWithNormalLayout;
+
+        // Pre-layout orthogonal children in order to get a valid value for the preferred width.
+        if (style().isHorizontalWritingMode() != child->style().isHorizontalWritingMode())
+            child->layoutIfNeeded();
 
         LayoutUnit margin = marginIntrinsicLogicalWidthForChild(*child);